address feedback

r-lib · Nov 30, 2024 · ab6cb64 · ab6cb64
1 parent 5705339
commit ab6cb64
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/R/rules-line-breaks.R b/R/rules-line-breaks.R
@@ -449,12 +449,7 @@ remove_empty_lines_after_opening_and_before_closing_braces <- function(pd) {
 }
 
 
-reduce_extra_blank_lines_between_scopes <- function(pd, allowed_blank_lines = 2L) {
-  # Calculate the maximum allowed lag_newlines
-  max_lag_newlines <- allowed_blank_lines + 1L # +1 accounts for the line with the previous token
-
-  # cap lag_newlines at max_lag_newlines
-  pd$lag_newlines <- pmin(pd$lag_newlines, max_lag_newlines)
-
+reduce_extra_blank_lines_between_top_level_exprs <- function(pd, allowed_blank_lines = 2L) {
+  pd$lag_newlines <- pmin(pd$lag_newlines, allowed_blank_lines + 1L)
   pd
 }
diff --git a/R/style-guides.R b/R/style-guides.R
@@ -139,8 +139,8 @@ tidyverse_style <- function(scope = "tokens",
         if (strict) remove_line_break_before_round_closing_after_curly,
       remove_line_breaks_in_fun_dec =
         if (strict) remove_line_breaks_in_fun_dec,
-      reduce_extra_blank_lines_between_scopes =
-        if (strict) reduce_extra_blank_lines_between_scopes,
+      reduce_extra_blank_lines_between_top_level_exprs =
+        if (strict) reduce_extra_blank_lines_between_top_level_exprs,
       style_line_break_around_curly = partial(
         style_line_break_around_curly,
         strict

diff --git a/tests/testthat/test-transformers-drop.R b/tests/testthat/test-transformers-drop.R
@@ -72,7 +72,7 @@ test_that("tidyverse transformers are correctly dropped", {
 
   names_line_break <- c(
     "remove_empty_lines_after_opening_and_before_closing_braces",
-    "reduce_extra_blank_lines_between_scopes",
+    "reduce_extra_blank_lines_between_top_level_exprs",
     "set_line_break_around_comma_and_or",
     "set_line_break_after_assignment",
     "set_line_break_after_opening_if_call_is_multi_line",