Merge pull request #822 from lorenzwalthert/issue-821

- Don't break line around comments (#822).

Author: lorenzwalthert

NEWS.md

@@ -1,3 +1,7 @@
+# styler 1.5.1.9000 (Development version)
+
+* Don't break line before comments in pipes (#822).
+
 # styler 1.5.1
 
 ## Alignment detection

R/rules-line-breaks.R

@@ -193,7 +193,7 @@ add_line_break_after_pipe <- function(pd) {
 
   if (sum(is_pipe & pd$token_after != "COMMENT") > 1 &&
     !(next_terminal(pd, vars = "token_before")$token_before %in% c("'('", "EQ_SUB", "','"))) {
-    pd$lag_newlines[lag(is_pipe)] <- 1L
+    pd$lag_newlines[lag(is_pipe) & pd$token != "COMMENT"] <- 1L
   }
   pd
 }

tests/testthat/line_breaks_and_other/base-pipe-line-breaks-in.R

@@ -81,3 +81,8 @@ blew(y = 2, x |>
 
 
 {a |> c() +1}
+
+b |>
+  f() |> # never move comment to next line as it can be styler: off or nolint
+  k() |>
+  x()

tests/testthat/line_breaks_and_other/base-pipe-line-breaks-in_tree

@@ -88,3 +88,8 @@ blew(y = 2, x |>
 {
   a |> c() + 1
 }
+
+b |>
+  f() |> # never move comment to next line as it can be styler: off or nolint
+  k() |>
+  x()

tests/testthat/line_breaks_and_other/base-pipe-line-breaks-out.R

@@ -83,3 +83,9 @@ blew(y = 2, x %>%
 
 
 {a %>% c +1}
+
+
+b %>%
+  f() %>% # never move comment to next line as it can be styler: off or nolint
+  k() %>%
+  x()

tests/testthat/line_breaks_and_other/pipe-line-breaks-in.R

@@ -92,3 +92,9 @@ blew(y = 2, x %>%
 {
   a %>% c() + 1
 }
+
+
+b %>%
+  f() %>% # never move comment to next line as it can be styler: off or nolint
+  k() %>%
+  x()