Merge pull request #645 from lorenzwalthert/issue-627

- No more than one line break between pipes (#627).

Author: lorenzwalthert

R/rules-line-break.R

@@ -182,8 +182,10 @@ remove_line_breaks_in_fun_dec <- function(pd) {
 
 #' @importFrom rlang seq2
 add_line_break_after_pipe <- function(pd) {
-  is_pipe <- pd$token == c("SPECIAL-PIPE") & pd$token_after != "COMMENT"
-  if (sum(is_pipe) > 1 &&
+  is_pipe <- pd$token == c("SPECIAL-PIPE")
+  pd$lag_newlines[lag(is_pipe) & pd$lag_newlines > 1] <- 1L
+
+  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
   }

tests/testthat/indention_operators/pipe_simple-in.R

@@ -5,3 +5,14 @@ c() %>%
                                  g_out()
 
 a <- function(jon_the_pipe) {}
+
+x %>%
+
+  # break
+  call()
+
+
+y %>%
+
+
+  call() # mor

tests/testthat/indention_operators/pipe_simple-out.R

@@ -5,3 +5,11 @@ a %>%
   g_out()
 
 a <- function(jon_the_pipe) {}
+
+x %>%
+  # break
+  call()
+
+
+y %>%
+  call() # mor

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

@@ -82,7 +82,6 @@ fun(
 
 # FIXME closing brace could go on ntext line. Alternative: remove lin breaks completely.
 blew(x %>%
-
   c(), y = 2)
 
 # FIXME closing brace could go on ntext line. Alternative: move c() up.