Merge pull request #92 from lorenzwalthert/speedup

curly braces don't move a line up if previous token is comment

Author: lorenzwalthert

R/rules-line_break.R

@@ -1,6 +1,6 @@
 # A { should never go on its own line
 remove_line_break_before_curly_opening <- function(pd) {
-  rm_break <- pd$token_after == "'{'"
+  rm_break <- (pd$token_after == "'{'") & (pd$token != "COMMENT")
   pd$lag_newlines[lag(rm_break)] <- 0L
   pd
 }

tests/testthat/indention_operators/while_for_if_without_curly-in_tree

@@ -0,0 +1,4 @@
+a <- function(x) # this is a comment and the bracket below should not be moved one line up after the comment.
+{
+  x
+}

tests/testthat/line_breaks_and_other/edge_comment_and_curly-in.R

@@ -0,0 +1,4 @@
+a <- function(x) # this is a comment and the bracket below should not be moved one line up after the comment.
+{
+  x
+}

tests/testthat/line_breaks_and_other/edge_comment_and_curly-in_tree

@@ -11,6 +11,11 @@ test_that("line breaks involing curly brackets", {
                   transformer = style_text), NA)
 })
 
+test_that("line breaks involing curly brackets", {
+  expect_warning(test_collection("line_breaks_and_other", "edge_comment_and_curly",
+                                 transformer = style_text), NA)
+})
+
 test_that("adding and removing line breaks", {
   expect_warning(test_collection("line_breaks_and_other", "if",
                   transformer = style_text), NA)