Merge pull request #635 from lorenzwalthert/issue-632

- Don't remove blank lines around comments (#632).

Author: lorenzwalthert

.pre-commit-config.yaml

@@ -11,6 +11,7 @@ repos:
     -   id: spell-check
     -   id: style-files
         args: [--style_pkg=styler, --style_fun=tidyverse_style]
+        exclude: 'tests/testthat/.*/*\.R'
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.5.0
     hooks:

NEWS.md

@@ -2,7 +2,8 @@
 
 ## Major changes
 
-- blank lines in function calls and headers are now removed (#629, #630).
+- blank lines in function calls and headers are now removed, for the former only 
+  when there are no comments before or after the blank line (#629, #630, #635).
 
 ## Minor chnages and fixes
 

R/rules-line-break.R

@@ -273,9 +273,7 @@ remove_line_break_in_fun_call <- function(pd, strict) {
   if (is_function_call(pd)) {
     # no blank lines within function calls
     if (strict) {
-      pd$lag_newlines[lag(pd$token == "','") & pd$lag_newlines > 1] <- 1L
-
-      pd$lag_newlines[lag(pd$token == "COMMENT") & pd$lag_newlines > 0] <- 1L
+      pd$lag_newlines[lag(pd$token == "','") & pd$lag_newlines > 1 & pd$token != "COMMENT"] <- 1L
     }
     if (nrow(pd) == 3) {
       pd$lag_newlines[3] <- 0L

inst/WORDLIST

@@ -22,6 +22,7 @@ emacs
 EOF
 EOL
 EOLs
+EQ
 expr
 expr EQ
 filetype
@@ -64,6 +65,7 @@ rplumber
 rprofile
 Rprofile
 StackOverflow
+STR
 styler
 stylerignore
 stylerignored

tests/testthat/line_breaks_fun_call/blank-strict-in.R

@@ -16,3 +16,17 @@ call(
 
   "w"
 )
+
+call(
+  1,
+  2,
+
+
+
+  # comment
+
+  1,
+  2,
+
+  3
+)

tests/testthat/line_breaks_fun_call/blank-strict-in_tree

@@ -4,6 +4,7 @@ call(
 
 call(
   # comment
+
   1
 )
 
@@ -12,3 +13,16 @@ call(
   1,
   "w"
 )
+
+call(
+  1,
+  2,
+
+
+
+  # comment
+
+  1,
+  2,
+  3
+)