better naming

r-lib · May 11, 2024 · e0e2ed4 · e0e2ed4
1 parent 2df29fb
commit e0e2ed4
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/R/rules-line-breaks.R b/R/rules-line-breaks.R
@@ -419,7 +419,7 @@ set_line_break_after_ggplot2_plus <- function(pd) {
 }
 
 
-remove_empty_line_after_opening_braces <- function(pd) {
+remove_empty_lines_after_opening_braces <- function(pd) {
   opening_braces <- c("'('", "'['", "LBB")
   paren_after <- pd$token %in% opening_braces
   if (!any(paren_after)) {
@@ -431,7 +431,7 @@ remove_empty_line_after_opening_braces <- function(pd) {
   pd
 }
 
-remove_empty_line_before_closing_braces <- function(pd) {
+remove_empty_lines_before_closing_braces <- function(pd) {
   closing_braces <- c("')'", "']'", "RBB")
   paren_before <- pd$token %in% closing_braces
   if (!any(paren_before)) {

diff --git a/R/rules-spaces.R b/R/rules-spaces.R
@@ -131,7 +131,8 @@ remove_space_after_unary_pm_nested <- function(pd) {
 }
 
 remove_space_before_opening_paren <- function(pd_flat) {
-  paren_after <- pd_flat$token %in% c("'('", "'['", "LBB")
+  opening_braces <- c("'('", "'['", "LBB")
+  paren_after <- pd_flat$token %in% opening_braces
   if (!any(paren_after)) {
     return(pd_flat)
   }
@@ -141,8 +142,8 @@ remove_space_before_opening_paren <- function(pd_flat) {
 }
 
 remove_space_after_opening_paren <- function(pd_flat) {
-  braces <- c("'('", "'['", "LBB")
-  paren_after <- pd_flat$token %in% braces
+  opening_braces <- c("'('", "'['", "LBB")
+  paren_after <- pd_flat$token %in% opening_braces
   if (!any(paren_after)) {
     return(pd_flat)
   }
@@ -151,8 +152,8 @@ remove_space_after_opening_paren <- function(pd_flat) {
 }
 
 remove_space_before_closing_paren <- function(pd_flat) {
-  braces <- c("')'", "']'")
-  paren_after <- pd_flat$token %in% braces
+  closing_braces <- c("')'", "']'")
+  paren_after <- pd_flat$token %in% closing_braces
   if (!any(paren_after)) {
     return(pd_flat)
   }

diff --git a/R/style-guides.R b/R/style-guides.R
@@ -167,8 +167,8 @@ tidyverse_style <- function(scope = "tokens",
       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
+      remove_empty_lines_after_opening_braces = remove_empty_lines_after_opening_braces,
+      remove_empty_lines_before_closing_braces = remove_empty_lines_before_closing_braces
     )
   }
 

diff --git a/tests/testthat/test-transformers-drop.R b/tests/testthat/test-transformers-drop.R
@@ -77,8 +77,8 @@ test_that("tidyverse transformers are correctly dropped", {
     "set_line_break_before_closing_call",
     "remove_line_break_in_fun_call",
     "set_line_break_after_ggplot2_plus",
-    "remove_empty_line_after_opening_braces",
-    "remove_empty_line_before_closing_braces"
+    "remove_empty_lines_after_opening_braces",
+    "remove_empty_lines_before_closing_braces"
   )
   expect_setequal(names(t_fun$line_break), names_line_break)