address review feedback

Author: IndrajeetPatil

R/rules-line-breaks.R

@@ -449,26 +449,13 @@ remove_empty_lines_after_opening_and_before_closing_braces <- function(pd) {
 }
 
 
-#' Reduce multiple blank lines to a maximum number of allowed blank lines
-#' @param pd_flat A flat parse table.
-#' @param allowed_blank_lines The maximum number of allowed blank lines between code elements. Default is `2L`.
-#' @keywords internal
-reduce_extra_blank_lines_between_scopes <- function(pd_flat, allowed_blank_lines = 2L) {
+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
-
-  # Create a copy of lag_newlines to track modifications
-  modified_lag_newlines <- pd_flat$lag_newlines
+  max_lag_newlines <- allowed_blank_lines + 1L  # +1 accounts for the line with the previous token
 
-  # Iterate through the dataframe to reduce consecutive blank lines
-  for (i in seq_along(modified_lag_newlines)) {
-    if (modified_lag_newlines[i] > max_lag_newlines) {
-      modified_lag_newlines[i] <- max_lag_newlines
-    }
-  }
+  # cap lag_newlines at max_lag_newlines
+  pd$lag_newlines <- pmin(pd$lag_newlines, max_lag_newlines)
 
-  # Update the original data frame
-  pd_flat$lag_newlines <- modified_lag_newlines
-
-  return(pd_flat)
+  pd
 }
+

R/style-guides.R

@@ -139,7 +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 = reduce_extra_blank_lines_between_scopes,
+      reduce_extra_blank_lines_between_scopes =
+        if (strict) reduce_extra_blank_lines_between_scopes,
       style_line_break_around_curly = partial(
         style_line_break_around_curly,
         strict

man/reduce_extra_blank_lines_between_scopes.Rd

@@ -9,3 +9,14 @@ f %>% g()
 
 
 h %>% i()
+
+
+
+
+
+# some comment
+
+
+
+
+j %>% k()

tests/testthat/line_breaks_and_other/pipe_and_comment-in.R

@@ -6,3 +6,9 @@ f %>% g()
 
 
 h %>% i()
+
+
+# some comment
+
+
+j %>% k()

tests/testthat/line_breaks_and_other/pipe_and_comment-out.R

@@ -9,6 +9,9 @@ call(
 )
 
 
+
+
+
 call(
   x = 2,
   1,