create new transformers for removing empty lines

Author: IndrajeetPatil

R/rules-line-breaks.R

@@ -244,7 +244,7 @@ remove_line_breaks_in_fun_dec <- function(pd) {
   pd
 }
 
-#'
+
 add_line_break_after_pipe <- function(pd) {
   is_pipe <- pd$token %in% c("SPECIAL-PIPE", "PIPE")
   pd$lag_newlines[lag(is_pipe) & pd$lag_newlines > 1L] <- 1L
@@ -417,3 +417,28 @@ set_line_break_after_ggplot2_plus <- function(pd) {
   }
   pd
 }
+
+
+remove_empty_line_after_opening_braces <- function(pd) {
+  opening_braces <- c("'('", "'['", "LBB")
+  paren_after <- pd$token %in% opening_braces
+  if (!any(paren_after)) {
+    return(pd)
+  }
+  pd$lag_newlines[
+    lag(pd$token %in% opening_braces) & pd$lag_newlines > 1L
+  ] <- 1L
+  pd
+}
+
+remove_empty_line_before_closing_braces <- function(pd) {
+  closing_braces <- c("')'", "']'", "RBB")
+  paren_before <- pd$token %in% closing_braces
+  if (!any(paren_before)) {
+    return(pd)
+  }
+  pd$lag_newlines[
+    pd$token %in% closing_braces & pd$lag_newlines > 1L
+  ] <- 1L
+  pd
+}

R/rules-spaces.R

@@ -146,10 +146,6 @@ remove_space_after_opening_paren <- function(pd_flat) {
   if (!any(paren_after)) {
     return(pd_flat)
   }
-  # remove blank lines after opening braces
-  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
 }
@@ -160,10 +156,6 @@ remove_space_before_closing_paren <- function(pd_flat) {
   if (!any(paren_after)) {
     return(pd_flat)
   }
-  # remove blank lines before closing braces
-  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

@@ -166,7 +166,9 @@ tidyverse_style <- function(scope = "tokens",
       add_line_break_after_pipe = if (strict) add_line_break_after_pipe,
       set_line_break_after_ggplot2_plus = if (strict) {
         set_line_break_after_ggplot2_plus
-      }
+      },
+      remove_empty_line_after_opening_braces = remove_empty_line_after_opening_braces,
+      remove_empty_line_before_closing_braces = remove_empty_line_before_closing_braces
     )
   }
 

tests/testthat/test-transformers-drop.R

@@ -76,7 +76,9 @@ test_that("tidyverse transformers are correctly dropped", {
     "set_line_break_after_opening_if_call_is_multi_line",
     "set_line_break_before_closing_call",
     "remove_line_break_in_fun_call",
-    "set_line_break_after_ggplot2_plus"
+    "set_line_break_after_ggplot2_plus",
+    "remove_empty_line_after_opening_braces",
+    "remove_empty_line_before_closing_braces"
   )
   expect_setequal(names(t_fun$line_break), names_line_break)