Merge pull request #152 from lorenzwalthert/no_reindention_calls

- No line break after `switch()` and friends (#152).

Author: krlmlr

R/rules-line_break.R

@@ -52,7 +52,10 @@ add_line_break_after_pipe <- function(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
+#' @param except_token_after A character vector with tokens after "'('" that do
+#'   not cause a line break after "'('".
+#' @param except_text_before A character vector with texts before "'('" that do
+#'   not cause a line break after "'('".
 #' @name set_line_break_if_call_is_multi_line
 #' @importFrom rlang seq2
 NULL
@@ -61,12 +64,17 @@ NULL
 #'   opening parenthesis.
 set_line_break_after_opening_if_call_is_multi_line <-
   function(pd,
-           except_token = NULL) {
+           except_token_after = NULL,
+           except_text_before  = 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)
+  exception_pos <- c(
+    which(pd$token %in% except_token_after),
+    ifelse(pd$child[[1]]$text[1] %in% except_text_before, 3L, NA)
+  )
+  pd$lag_newlines[3] <- 0L
   pd$lag_newlines[setdiff(3, exception_pos)] <- 1L
   pd
 }

R/style_guides.R

@@ -75,7 +75,8 @@ tidyverse_style <- function(scope = "tokens",
         add_line_break_before_curly_closing,
       partial(
         set_line_break_after_opening_if_call_is_multi_line,
-        except_token = "COMMENT"
+        except_token_after = "COMMENT",
+        except_text_before = c("switch", "ifelse", "if_else")
       ),
       set_line_break_before_closing_if_call_is_multi_line,
       remove_line_break_in_empty_fun_call,

man/set_line_break_if_call_is_multi_line.Rd

@@ -1,5 +1,4 @@
-switch(
-  engine,
+switch(engine,
   pdftex = {
     if (any) {
       x

tests/testthat/indention_operators/eq_assign-out.R

@@ -0,0 +1,20 @@
+call(
+  2,
+  3
+)
+
+switch(abc,
+  wei9
+)
+
+switch(abc,
+  wei9
+)
+
+if_else(a,
+  c, v
+)
+
+ifelse(x,
+  y, z
+)

tests/testthat/line_breaks_fun_call/switch_ifelse_etc_no_line_break-in.R

@@ -0,0 +1,20 @@
+call(
+  2,
+  3
+)
+
+switch(abc,
+  wei9
+)
+
+switch(abc,
+  wei9
+)
+
+if_else(a,
+  c, v
+)
+
+ifelse(x,
+  y, z
+)