Remove blank lines after opening and before closing braces

R/rules-spaces.R

@@ -140,20 +140,34 @@ remove_space_before_opening_paren <- function(pd_flat) {
   pd_flat
 }
 
-remove_space_after_opening_paren <- function(pd_flat) {
-  paren_after <- pd_flat$token %in% c("'('", "'['", "LBB")
+remove_space_after_opening_paren <- function(pd_flat, strict) {
+  braces <- c("'('", "'['", "LBB")
+  paren_after <- pd_flat$token %in% braces
   if (!any(paren_after)) {
     return(pd_flat)
   }
+  # remove blank lines after opening braces
+  if (strict) {
+    pd_flat$lag_newlines[
+      lag(pd_flat$token %in% braces) & pd_flat$lag_newlines > 1L
+    ] <- 1L
+  }
   pd_flat$spaces[paren_after & (pd_flat$newlines == 0L)] <- 0L
   pd_flat
 }
 
-remove_space_before_closing_paren <- function(pd_flat) {
-  paren_after <- pd_flat$token %in% c("')'", "']'")
+remove_space_before_closing_paren <- function(pd_flat, strict) {
+  braces <- c("')'", "']'")
+  paren_after <- pd_flat$token %in% braces
   if (!any(paren_after)) {
     return(pd_flat)
   }
+  # remove blank lines before closing braces
+  if (strict) {
+    pd_flat$lag_newlines[
+      pd_flat$token %in% braces & pd_flat$lag_newlines > 1L
+    ] <- 1L
+  }
   paren_before <- lead(paren_after, default = FALSE)
   pd_flat$spaces[paren_before & (pd_flat$newlines == 0L)] <- 0L
   pd_flat

R/style-guides.R

@@ -87,7 +87,10 @@ tidyverse_style <- function(scope = "tokens",
   }
   space_manipulators <- if ("spaces" %in% scope) {
     list(
-      remove_space_before_closing_paren = remove_space_before_closing_paren,
+      remove_space_before_closing_paren = purrr::partial(
+        remove_space_before_closing_paren,
+        strict = strict
+      ),
       remove_space_before_opening_paren = if (strict) {
         remove_space_before_opening_paren
       },
@@ -105,7 +108,10 @@ tidyverse_style <- function(scope = "tokens",
       spacing_around_op = purrr::partial(set_space_around_op,
         strict = strict
       ),
-      remove_space_after_opening_paren = remove_space_after_opening_paren,
+      remove_space_after_opening_paren = purrr::partial(
+        remove_space_after_opening_paren,
+        strict = strict
+      ),
       remove_space_after_excl = remove_space_after_excl,
       set_space_after_bang_bang = set_space_after_bang_bang,
       remove_space_before_dollar = remove_space_before_dollar,

tests/testthat/indention_curly_brackets/multi_line_curly_only-in.R

@@ -2,3 +2,11 @@
          {1 + 3}
 {2 + sin(pi)}
       }
+
+      {
+
+        {1 + 3}
+        {2 + sin(pi)}
+
+
+      }

tests/testthat/indention_curly_brackets/multi_line_curly_only-out.R

@@ -6,3 +6,12 @@
     2 + sin(pi)
   }
 }
+
+{
+  {
+    1 + 3
+  }
+  {
+    2 + sin(pi)
+  }
+}

tests/testthat/indention_curly_brackets/multi_line_curly_while_for_if_fun-in.R

@@ -8,3 +8,18 @@ a <- function(x, y, z)            {
     x[i] +1
   }
 }
+
+
+if (
+
+  require("logspline") &&
+    require("rstanarm")
+
+
+
+) {
+
+  NULL
+
+
+  }