don't move comments a line down since they can be qa comments

Author: lorenzwalthert

R/rules-line-breaks.R

@@ -157,7 +157,7 @@ style_line_break_around_curly <- function(strict, pd) {
     to_break <- lag(opening_before, default = FALSE) | closing_before
     len_to_break <- sum(to_break)
     pd$lag_newlines[to_break] <- ifelse(rep(strict, len_to_break),
-      1L,
+      ifelse(pd$token[to_break] == "COMMENT", pmin(1L, pd$lag_newlines[to_break]), 1L),
       pmax(1L, pd$lag_newlines[to_break])
     )
   } else {

tests/testthat/indention_multiple/overall-out.R

@@ -8,8 +8,7 @@ a <- function(x) {
       22 + 1
     ))
     if (x > 10) {
-      for (x in 22) {
-        # FIXME in operator only to be surrounded by one space. What about %in%?
+      for (x in 22) { # FIXME in operator only to be surrounded by one space. What about %in%?
         prin(x)
       }
     }

tests/testthat/line_breaks_and_other/comment-around-curly-in.R

@@ -0,0 +1,2 @@
+X_and_F_symbol_linter <- function() { # nolint: object_name.
+}

tests/testthat/line_breaks_and_other/comment-around-curly-out.R

@@ -0,0 +1,2 @@
+X_and_F_symbol_linter <- function() { # nolint: object_name.
+}

tests/testthat/test-line_breaks_and_other.R

@@ -68,3 +68,9 @@ test_that("line is correctly broken around = ", {
     transformer = style_text
   ), NA)
 })
+
+test_that("comments are not moved down after {", {
+  expect_warning(test_collection("line_breaks_and_other", "comment-around-curly",
+    transformer = style_text
+  ), NA)
+})