Merge pull request #149 from lorenzwalthert/no_reindention_calls

Don't reindent function calls and break line correctly for multi-line calls (#149).

Author: lorenzwalthert

R/rules-line_break.R

@@ -42,8 +42,51 @@ remove_line_break_before_round_closing <- function(pd) {
   pd
 }
 
+#' @importFrom rlang seq2
 add_line_break_after_pipe <- function(pd) {
   is_special <- pd$token %in% c("SPECIAL-PIPE")
   pd$lag_newlines[lag(is_special)] <- 1L
   pd
 }
+
+
+#' Set line break for multi-line function calls
+#' @param pd A parse table.
+#' @param except_token A character vector with tokens before "'('" that do not
+#' @name set_line_break_if_call_is_multi_line
+#' @importFrom rlang seq2
+NULL
+
+#' @describeIn set_line_break_if_call_is_multi_line Sets line break after
+#'   opening parenthesis.
+set_line_break_after_opening_if_call_is_multi_line <-
+  function(pd,
+           except_token = NULL) {
+  if (!is_function_call(pd)) return(pd)
+  npd <- nrow(pd)
+  is_multi_line <- any(pd$lag_newlines[seq2(3, npd - 1)] > 0)
+  if (!is_multi_line) return(pd)
+  exception_pos <- which(pd$token %in% except_token)
+  pd$lag_newlines[setdiff(3, exception_pos)] <- 1L
+  pd
+}
+
+
+#' @describeIn set_line_break_if_call_is_multi_line Sets line break before
+#'   closing parenthesis.
+set_line_break_before_closing_if_call_is_multi_line <- function(pd) {
+  if (!is_function_call(pd)) return(pd)
+  npd <- nrow(pd)
+  is_multi_line <- any(pd$lag_newlines[seq2(3, npd - 1)] > 0)
+  if (!is_multi_line) return(pd)
+  pd$lag_newlines[npd] <- 1L
+  pd
+}
+
+#' @rdname set_line_break_if_call_is_multi_line
+remove_line_break_in_empty_fun_call <- function(pd) {
+  if (is_function_call(pd) && nrow(pd) == 3) {
+    pd$lag_newlines[3] <- 0L
+  }
+  pd
+}

R/rules-spacing.R

@@ -215,6 +215,7 @@ remove_space_around_colons <- function(pd_flat) {
 }
 
 #' Set space between EQ_SUB and "','"
+#' @param pd A parse table.
 set_space_between_eq_sub_and_comma <- function(pd) {
   op_before <- which(pd$token == "EQ_SUB" & lead(pd$token == "','"))
   pd$spaces[op_before] <- 1L

R/style_guides.R

@@ -73,6 +73,12 @@ tidyverse_style <- function(scope = "tokens",
         add_line_break_afer_curly_opening,
       if (strict) set_line_break_before_curly_closing else
         add_line_break_before_curly_closing,
+      partial(
+        set_line_break_after_opening_if_call_is_multi_line,
+        except_token = "COMMENT"
+      ),
+      set_line_break_before_closing_if_call_is_multi_line,
+      remove_line_break_in_empty_fun_call,
       add_line_break_after_pipe
     )
 
@@ -87,7 +93,7 @@ tidyverse_style <- function(scope = "tokens",
   indention_modifier <-
     c(
       update_indention_ref_fun_dec,
-      update_indention_ref_fun_call
+      NULL
     )
 
   create_style_guide(

man/set_line_break_if_call_is_multi_line.Rd

@@ -1,7 +1,7 @@
 b<-function(x   ){
   x <- c(1,
                    2+     3,
-         sin(pi) ) # FIXME add tidyverse-comliant rule to break after '('
+         sin(pi) )
 
   if(x > 10){
 return("done")

man/set_space_between_eq_sub_and_comma.Rd

@@ -1,7 +1,9 @@
 b <- function(x) {
-  x <- c(1,
-         2 + 3,
-         sin(pi)) # FIXME add tidyverse-comliant rule to break after '('
+  x <- c(
+    1,
+    2 + 3,
+    sin(pi)
+  )
 
   if (x > 10) {
     return("done")

tests/testthat/indention_curly_brackets/multi_line_curly_round_spacing-in.R

@@ -6,7 +6,8 @@ test_that("this is a text", {
   {
     call(
       12, 1 + 1,
-      26)
+      26
+    )
   }
 }))
 

tests/testthat/indention_curly_brackets/multi_line_curly_round_spacing-in_tree

@@ -3,10 +3,12 @@
     (({
       {
         {
-          c(99,
+          c(
+            99,
             1 + 1, {
               "within that suff"
-          })
+            }
+          )
         }
       }
     }))