Supporting more indention patterns

R/get_transformers.R

@@ -39,6 +39,7 @@ get_transformers_flat <- function(strict = TRUE,
     remove_space_before_comma,
     remove_space_after_opening_paren,
     remove_space_after_excl,
+    remove_space_before_dollar,
     partial(start_comments_with_space,
             force_one = start_comments_with_one_space),
     NULL)
@@ -85,6 +86,7 @@ get_transformers_nested <- function(
       partial(indent_round, indent_by = indent_by),
       partial(indent_curly, indent_by = indent_by),
       partial(indent_op, indent_by = indent_by),
+      partial(indent_eq_sub, indent_by = indent_by),
       partial(indent_without_paren, indent_by = indent_by),
       get_transformers_flat(strict, start_comments_with_one_space),
       remove_space_after_unary_pm_nested,

R/modify_pd.R

@@ -21,15 +21,31 @@ indent_curly <- function(pd, indent_by) {
   set_unindention_child(pd, token = "'}'", unindent_by = indent_by)
 }
 
-#' @rdname update_indention
-indent_op <- function(pd, indent_by, token = c(math_token,
-                                               "SPECIAL-PIPE",
-                                               "LEFT_ASSIGN")) {
+#' @describeIn update_indention Indents operatos
+indent_op <- function(pd,
+                      indent_by,
+                      token = c(math_token,
+                                logical_token,
+                                special_token,
+                                "LEFT_ASSIGN",
+                                "'$'")) {
   indent_indices <- compute_indent_indices(pd, token, indent_last = TRUE)
   pd$indent[indent_indices] <- pd$indent[indent_indices] + indent_by
   pd
 }
 
+#' @describeIn update_indention Upates indention for token EQ_SUB. Only differs
+#'   from ident_op in the sense that the last token on the talbe where EQ_SUB
+#'   occurs is not indented (see[compute_indent_indices()])
+indent_eq_sub <- function(pd,
+                          indent_by,
+                          token = "EQ_SUB") {
+  indent_indices <- compute_indent_indices(pd, token, indent_last = FALSE)
+  pd$indent[indent_indices] <- pd$indent[indent_indices] + indent_by
+  pd
+}
+
+
 #' @describeIn update_indention Same as indent_op, but only indents one token
 #'   after `token`, not all remaining.
 indent_assign <- function(pd, indent_by, token = NULL) {
@@ -117,7 +133,7 @@ token_is_multi_line <- function(pd) {
 #' (R/rules-line_break.R) but we need `newlines` to determine
 #' whether or not to set `spaces` (R/rules-spacing.R), we have to update the
 #' attribute. We cannot simply use `dplyr::lead(pd$lag_newlines)` since we would
-#' loose information for the last token. `spaces` is left as is in
+#' lose information for the last token. `spaces` is left as is in
 #' R/rules-spacing.R for tokens at the end of a line since this allows styling
 #' without touching indention.
 #' @param pd A parse table.

R/relevel.R

@@ -20,8 +20,8 @@ flatten_operators <- function(pd_nested) {
 #' @param pd_nested A nested parse table.
 #' @include token.R
 flatten_operators_one <- function(pd_nested) {
-  pd_token_left <- c(special_token, math_token)
-  pd_token_right <- c(special_token, left_assignment_token,  "'+'", "'-'")
+  pd_token_left <- c(special_token, math_token, "'$'")
+  pd_token_right <- c(special_token, "LEFT_ASSIGN",  "'+'", "'-'")
   bound <- pd_nested %>%
     flatten_pd(pd_token_left, left = TRUE) %>%
     flatten_pd(pd_token_right, left = FALSE)

R/rules-spacing.R

@@ -189,3 +189,11 @@ remove_space_after_excl <- function(pd_flat) {
   pd_flat$spaces[excl] <- 0L
   pd_flat
 }
+
+
+remove_space_before_dollar <- function(pd_flat) {
+  dollar_after <- (pd_flat$token == "'$'") & (pd_flat$lag_newlines == 0L)
+  dollar_before <- lead(dollar_after, default = FALSE)
+  pd_flat$spaces[dollar_before] <- 0L
+  pd_flat
+}

R/token.R

@@ -10,6 +10,7 @@ token <- tribble(
   ">=" , "logical"     , "GE",
   "!=" , "logical"     , "NE",
   "==" , "logical"     , "EQ",
+  "="  , "assign_left" , "EQ_SUB",
   "="  , "assign_left" , "EQ_ASSIGN",
   "<-" , "assign_left" , "LEFT_ASSIGN",
   "->" , "assign_right", "RIGHT_ASSIGN",