Merge pull request #1254 from MichaelChirico/switch-newline

lorenzwalthert · web-flow · commit 8b43fe232870 · 2025-02-11T12:08:08.000+01:00
Ensure formatted token is a call before forcing line breaks
diff --git a/R/rules-line-breaks.R b/R/rules-line-breaks.R
@@ -310,7 +310,9 @@ set_line_break_after_opening_if_call_is_multi_line <- function(pd,
   if (!is_function_call(pd) && !is_subset_expr(pd)) {
     return(pd)
   }
-  has_force_text_before <- last(pd$child[[1L]]$text) %in% force_text_before
+  idx <- length(pd$child[[1L]]$text)
+  has_force_text_before <-
+    pd$child[[1L]]$text[idx] %in% force_text_before && pd$child[[1L]]$token[idx] == "SYMBOL_FUNCTION_CALL"
   if (has_force_text_before) {
     break_pos <- c(
       which(lag(pd$token %in% c("','", "COMMENT"))),
diff --git a/tests/testthat/line_breaks_fun_call/switch_ifelse_etc_no_line_break-in.R b/tests/testthat/line_breaks_fun_call/switch_ifelse_etc_no_line_break-in.R
@@ -73,3 +73,6 @@ dplyr::ifelse(
   x,
               1, 32
 )
+
+# variable name 'switch' is different
+l$switch[1:3, ]
diff --git a/tests/testthat/line_breaks_fun_call/switch_ifelse_etc_no_line_break-out.R b/tests/testthat/line_breaks_fun_call/switch_ifelse_etc_no_line_break-out.R
@@ -75,3 +75,6 @@ dplyr::ifelse(
   x,
   1, 32
 )
+
+# variable name 'switch' is different
+l$switch[1:3, ]

Original file line number	Diff line number	Diff line change
`@@ -73,3 +73,6 @@ dplyr::ifelse(`
`73`	`73`	`x,`
`74`	`74`	`1, 32`
`75`	`75`	`)`
	`76`	`+`
	`77`	`+# variable name 'switch' is different`
	`78`	`+l$switch[1:3, ]`
Original file line number	Diff line number	Diff line change
`@@ -75,3 +75,6 @@ dplyr::ifelse(`
`75`	`75`	`x,`
`76`	`76`	`1, 32`
`77`	`77`	`)`
	`78`	`+`
	`79`	`+# variable name 'switch' is different`
	`80`	`+l$switch[1:3, ]`