Merge pull request #809 from lorenzwalthert/issue-808

- Only remove excessive line breaks in assignments (#809).

Author: lorenzwalthert

NEWS.md

@@ -59,6 +59,8 @@
   code header anymore. This can be handy when the code can't be parsed, e.g.
   within a learnr tutorial (#790).
 * `#>` is recognized as an output marker and no space is added after `#` (#771).
+* multi-expressions containing multiple assignments no longer remove line breaks
+  if they are not causing blank lines (#809).
 * R code chunks in nested non-R chunks in R markdown don't yield an error 
   anymore when document is styled, chunks are still not styled (#788, #794).
 * `cache_activate()` and `cache_deactivate()` now respect the R 

R/rules-line-breaks.R

@@ -201,7 +201,7 @@ add_line_break_after_pipe <- function(pd) {
 set_line_break_after_assignment <- function(pd) {
   is_assignment <- lag(pd$token, default = FALSE) %in% c("LEFT_ASSIGN", "EQ_ASSIGN")
   if (any(is_assignment)) {
-    pd$lag_newlines[is_assignment] <- min(1L, pd$lag_newlines[is_assignment])
+    pd$lag_newlines[is_assignment] <- pmin(1L, pd$lag_newlines[is_assignment])
   }
   pd
 }

tests/testthat/line_breaks_and_other/assignment-in.R

@@ -22,3 +22,19 @@ x =
 
   # comment
   3
+
+
+
+ImportantDataFrame$ImportantColumn1 <-
+  ImportantDataFrame$ImportantColumn2 <-
+  ComplicatedFunction(ImportantDataFrame$InputColumn)
+
+
+ImportantDataFrame$ImportantColumn1 <-
+  ImportantDataFrame$ImportantColumn2 <- ComplicatedFunction(ImportantDataFrame$InputColumn)
+
+
+
+ImportantDataFrame$ImportantColumn1 <-
+
+  ImportantDataFrame$ImportantColumn2 <- ComplicatedFunction(ImportantDataFrame$InputColumn)

tests/testthat/line_breaks_and_other/assignment-in_tree

@@ -21,3 +21,18 @@ x <- 3
 x <-
   # comment
   3
+
+
+
+ImportantDataFrame$ImportantColumn1 <-
+  ImportantDataFrame$ImportantColumn2 <-
+  ComplicatedFunction(ImportantDataFrame$InputColumn)
+
+
+ImportantDataFrame$ImportantColumn1 <-
+  ImportantDataFrame$ImportantColumn2 <- ComplicatedFunction(ImportantDataFrame$InputColumn)
+
+
+
+ImportantDataFrame$ImportantColumn1 <-
+  ImportantDataFrame$ImportantColumn2 <- ComplicatedFunction(ImportantDataFrame$InputColumn)