whenver ther is an empty brace expression, remove line breaks

r-lib · Oct 8, 2024 · e1455c6 · e1455c6
1 parent 9d076fc
commit e1455c6
Show file tree

Hide file tree

Showing 14 changed files with 61 additions and 66 deletions.
diff --git a/R/rules-line-breaks.R b/R/rules-line-breaks.R
@@ -149,15 +149,21 @@ set_line_break_around_comma_and_or <- function(pd, strict) {
 }
 
 style_line_break_around_curly <- function(strict, pd) {
-  if (is_curly_expr(pd) && nrow(pd) > 2L) {
-    closing_before <- pd$token == "'}'"
-    opening_before <- (pd$token == "'{'")
-    to_break <- lag(opening_before, default = FALSE) | closing_before
-    pd$lag_newlines[to_break] <- ifelse(
-      pd$token[to_break] == "COMMENT",
-      pmin(1L, pd$lag_newlines[to_break]),
-      if (strict) 1L else pmax(1L, pd$lag_newlines[to_break])
-    )
+  if (is_curly_expr(pd)) {
+    n_row <- nrow(pd)
+    if (n_row > 2L) {
+      closing_before <- pd$token == "'}'"
+      opening_before <- (pd$token == "'{'")
+      to_break <- lag(opening_before, default = FALSE) | closing_before
+      pd$lag_newlines[to_break] <- ifelse(
+        pd$token[to_break] == "COMMENT",
+        pmin(1L, pd$lag_newlines[to_break]),
+        if (strict) 1L else pmax(1L, pd$lag_newlines[to_break])
+      )
+    } else if (n_row == 2L) {
+      # pd represents {}
+      pd$lag_newlines[2L] <- 0L
+    }
   } else {
     is_else <- pd$token == "ELSE"
     if (any(pd$token_before[is_else] == "'}'")) {

diff --git a/tests/testthat/indention_multiple/edge_strict_mixed-out.R b/tests/testthat/indention_multiple/edge_strict_mixed-out.R
@@ -23,5 +23,4 @@
 )))
 
 
-function(x, y, z) {
-}
+function(x, y, z) {}
diff --git a/tests/testthat/indention_operators/eq_formals_complex_tokens-out.R b/tests/testthat/indention_operators/eq_formals_complex_tokens-out.R
@@ -30,6 +30,4 @@ function(a =
          f =
            d, c =
            3, d =
-           4) {
-
-}
+           4) {}
diff --git a/tests/testthat/line_breaks_and_other/braces-fun-calls2-out.R b/tests/testthat/line_breaks_and_other/braces-fun-calls2-out.R
@@ -1,8 +1,6 @@
 test(
   "x",
-  {
-
-  },
+  {},
   a + b,
   {
     s(x = sd)
@@ -11,9 +9,7 @@ test(
 
 test(
   "x",
-  {
-
-  },
+  {},
   a + b,
   {
     s(x = sd)
@@ -22,9 +18,7 @@ test(
 
 test(
   "x",
-  {
-
-  },
+  {},
   a + b,
   {
     s(x = sd)
@@ -34,9 +28,7 @@ test(
 
 test(
   "x",
-  {
-
-  },
+  {},
   a + b,
   {
     s(x = sd)
@@ -45,9 +37,7 @@ test(
 
 test(
   "x",
-  {
-
-  }, # h
+  {}, # h
   a + b,
   {
     s(x = sd)
@@ -56,9 +46,7 @@ test(
 
 test(
   "x",
-  {
-
-  }, # h
+  {}, # h
   a + b,
   # k
   {
@@ -68,9 +56,7 @@ test(
 
 test(
   "x",
-  {
-
-  },
+  {},
   a + b, # k
   {
     s(x = sd)

diff --git a/tests/testthat/line_breaks_and_other/curly-in.R b/tests/testthat/line_breaks_and_other/curly-in.R
@@ -47,3 +47,15 @@ while (TRUE) { }
 
 while (TRUE)
   { }
+
+while (TRUE){
+
+ }
+
+while (TRUE){
+#
+ }
+
+
+while (TRUE){#
+ }
diff --git a/tests/testthat/line_breaks_and_other/curly-out.R b/tests/testthat/line_breaks_and_other/curly-out.R
@@ -43,3 +43,13 @@ test_that(
 while (TRUE) {}
 
 while (TRUE) {}
+
+while (TRUE) {}
+
+while (TRUE) {
+  #
+}
+
+
+while (TRUE) { #
+}
diff --git a/tests/testthat/line_breaks_fun_call/token_dependent_complex_non_strict-out.R b/tests/testthat/line_breaks_fun_call/token_dependent_complex_non_strict-out.R
@@ -5,8 +5,7 @@ call(call(
 call(call(1,
   2))
 # multi-line: no indention based on first vall
-call(a(b(c({
-}))))
+call(a(b(c({}))))
 
 call(call(
   2),

diff --git a/tests/testthat/line_breaks_fun_call/token_dependent_complex_strict-out.R b/tests/testthat/line_breaks_fun_call/token_dependent_complex_strict-out.R
@@ -7,8 +7,7 @@ call(call(
   2
 ))
 # multi-line: no indention based on first vall
-call(a(b(c({
-}))))
+call(a(b(c({}))))
 
 call(
   call(

diff --git a/tests/testthat/parse_comments/spinning_code_chunk_headers-out.R b/tests/testthat/parse_comments/spinning_code_chunk_headers-out.R
@@ -1,7 +1,5 @@
 # A comment
-a <- function() {
-
-}
+a <- function() {}
 
 #+ chunk-label, opt1=value1
 "chunk-content"

diff --git a/tests/testthat/public-api/xyz-r-and-rmd-dir/subdir/random-script-in-sub-dir.R b/tests/testthat/public-api/xyz-r-and-rmd-dir/subdir/random-script-in-sub-dir.R
@@ -1,4 +1,3 @@
 # random
 this(is_a_call(x))
-if (x) {
-}
+if (x) {}
diff --git a/tests/testthat/public-api/xyzdir/subdir/random-script-in-sub-dir.R b/tests/testthat/public-api/xyzdir/subdir/random-script-in-sub-dir.R
@@ -1,4 +1,3 @@
 # random
 this(is_a_call(x))
-if (x) {
-}
+if (x) {}
diff --git a/tests/testthat/spacing/round_curly-out.R b/tests/testthat/spacing/round_curly-out.R
@@ -1,5 +1,4 @@
-a <- function(x) {
-}
+a <- function(x) {}
 
 if (a) {
   3
@@ -13,5 +12,4 @@ if (x) {
   y
 } else if (x) {
   x
-} else {
-}
+} else {}
diff --git a/tests/testthat/strict/non_strict-out.R b/tests/testthat/strict/non_strict-out.R
@@ -51,17 +51,13 @@ test <- function() {
     call
   })
 
-  braced("unnamed reduces space",    {
-  })
+  braced("unnamed reduces space",    {})
 
-  braced("unnamed adds space space", {
-  })
+  braced("unnamed adds space space", {})
 
-  braced(named_reduces_space =    {
-  })
+  braced(named_reduces_space =    {})
 
-  braced(named_adds_space =    {
-  })
+  braced(named_adds_space =    {})
 
   braced({
     empty_removes_space

diff --git a/tests/testthat/strict/strict-out.R b/tests/testthat/strict/strict-out.R
@@ -34,17 +34,13 @@ test <- function() {
     call
   })
 
-  braced("unnamed reduces space", {
-  })
+  braced("unnamed reduces space", {})
 
-  braced("unnamed adds space space", {
-  })
+  braced("unnamed adds space space", {})
 
-  braced(named_reduces_space = {
-  })
+  braced(named_reduces_space = {})
 
-  braced(named_adds_space = {
-  })
+  braced(named_adds_space = {})
 
   braced({
     empty_removes_space