never remove line breaks when it moves code behind a comment

r-lib · Dec 27, 2022 · f808f1c · f808f1c
1 parent 0b34e99
commit f808f1c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/R/rules-line-breaks.R b/R/rules-line-breaks.R
@@ -211,8 +211,8 @@ set_line_break_around_curly_curly <- function(pd) {
     closing_before <- (pd$token == "'}'") &
       (pd$token_after == "'}'" | pd$token_before == "'}'")
     if (any(opening_before) && any(closing_before)) {
-      pd$lag_newlines[lag(opening_before, default = FALSE)] <- 0L
-      pd$lag_newlines[closing_before] <- 0L
+      pd$lag_newlines[lag(opening_before, default = FALSE) & pd$token != "COMMENT"] <- 0L
+      pd$lag_newlines[closing_before & pd$token_before != "COMMENT"] <- 0L
     }
   }
   pd

diff --git a/tests/testthat/curly-curly/mixed-in.R b/tests/testthat/curly-curly/mixed-in.R
@@ -98,3 +98,17 @@ call(
   {{ x }},
   {{ y}} := 3, f(bk)
 )
+
+call({{
+  #
+  1
+}})
+
+call({{
+  #
+}})
+
+
+{{
+  #
+}}
diff --git a/tests/testthat/curly-curly/mixed-out.R b/tests/testthat/curly-curly/mixed-out.R
@@ -97,3 +97,16 @@ call(
   {{ x }},
   {{ y }} := 3, f(bk)
 )
+
+call({{
+  #
+  1 }})
+
+call({{
+  #
+}})
+
+
+{{
+  #
+}}