use only a single transformer

Author: IndrajeetPatil

R/rules-line-breaks.R

@@ -419,26 +419,23 @@ set_line_break_after_ggplot2_plus <- function(pd) {
 }
 
 
-remove_empty_lines_after_opening_braces <- function(pd) {
+remove_empty_lines_after_opening_and_before_closing_braces <- function(pd) {
   opening_braces <- c("'('", "'['", "LBB")
+  closing_braces <- c("')'", "']'")
+
   paren_after <- pd$token %in% opening_braces
-  if (!any(paren_after)) {
-    return(pd)
+  if (any(paren_after)) {
+    pd$lag_newlines[
+      lag(pd$token %in% opening_braces) & pd$lag_newlines > 1L
+    ] <- 1L
   }
-  pd$lag_newlines[
-    lag(pd$token %in% opening_braces) & pd$lag_newlines > 1L
-  ] <- 1L
-  pd
-}
 
-remove_empty_lines_before_closing_braces <- function(pd) {
-  closing_braces <- c("')'", "']'")
   paren_before <- pd$token %in% closing_braces
-  if (!any(paren_before)) {
-    return(pd)
+  if (any(paren_before)) {
+    pd$lag_newlines[
+      pd$token %in% closing_braces & pd$lag_newlines > 1L
+    ] <- 1L
   }
-  pd$lag_newlines[
-    pd$token %in% closing_braces & pd$lag_newlines > 1L
-  ] <- 1L
+
   pd
 }

R/style-guides.R

@@ -130,6 +130,8 @@ tidyverse_style <- function(scope = "tokens",
 
   line_break_manipulators <- if ("line_breaks" %in% scope) {
     list(
+      remove_empty_lines_after_opening_and_before_closing_braces =
+        remove_empty_lines_after_opening_and_before_closing_braces,
       set_line_break_around_comma_and_or = set_line_break_around_comma_and_or,
       set_line_break_after_assignment = set_line_break_after_assignment,
       set_line_break_before_curly_opening = set_line_break_before_curly_opening,
@@ -166,9 +168,7 @@ 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_lines_after_opening_braces = remove_empty_lines_after_opening_braces,
-      remove_empty_lines_before_closing_braces = remove_empty_lines_before_closing_braces
+      }
     )
   }
 

tests/testthat/test-transformers-drop.R

@@ -71,14 +71,13 @@ test_that("tidyverse transformers are correctly dropped", {
   t_fun <- transformers_drop("x", t_style)
 
   names_line_break <- c(
+    "remove_empty_lines_after_opening_and_before_closing_braces",
     "set_line_break_around_comma_and_or",
     "set_line_break_after_assignment",
     "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",
-    "remove_empty_lines_after_opening_braces",
-    "remove_empty_lines_before_closing_braces"
+    "set_line_break_after_ggplot2_plus"
   )
   expect_setequal(names(t_fun$line_break), names_line_break)