Merge pull request #1049 from Polkas/1048_setlinebreak

IndrajeetPatil · web-flow · commit 29599f1e09c6 · 2022-11-07T10:39:35.000+01:00
Rename internal function `set_linebreak_after_ggplot2_plus()` to `set_line_break_after_ggplot2_plus()`
diff --git a/R/rules-line-breaks.R b/R/rules-line-breaks.R
@@ -390,7 +390,7 @@ remove_line_break_in_fun_call <- function(pd, strict) {
 }
 
 
-set_linebreak_after_ggplot2_plus <- function(pd) {
+set_line_break_after_ggplot2_plus <- function(pd) {
   # if expression is unary, first token is +. Exclude this case.
   is_plus_raw <- c(FALSE, pd$token[-1L] == "'+'")
   if (any(is_plus_raw)) {
diff --git a/R/style-guides.R b/R/style-guides.R
@@ -165,8 +165,8 @@ tidyverse_style <- function(scope = "tokens",
         strict = strict
       ),
       add_line_break_after_pipe = if (strict) add_line_break_after_pipe,
-      set_linebreak_after_ggplot2_plus = if (strict) {
-        set_linebreak_after_ggplot2_plus
+      set_line_break_after_ggplot2_plus = if (strict) {
+        set_line_break_after_ggplot2_plus
       }
     )
   }
diff --git a/tests/testthat/test-transformers-drop.R b/tests/testthat/test-transformers-drop.R
@@ -76,7 +76,7 @@ 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_linebreak_after_ggplot2_plus"
+    "set_line_break_after_ggplot2_plus"
   )
   expect_setequal(names(t_fun$line_break), names_line_break)
 

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ remove_line_break_in_fun_call <- function(pd, strict) {`
`390`	`390`	`}`
`391`	`391`
`392`	`392`
`393`		`-set_linebreak_after_ggplot2_plus <- function(pd) {`
	`393`	`+set_line_break_after_ggplot2_plus <- function(pd) {`
`394`	`394`	`# if expression is unary, first token is +. Exclude this case.`
`395`	`395`	`is_plus_raw <- c(FALSE, pd$token[-1L] == "'+'")`
`396`	`396`	`if (any(is_plus_raw)) {`
Original file line number	Diff line number	Diff line change
`@@ -165,8 +165,8 @@ tidyverse_style <- function(scope = "tokens",`
`165`	`165`	`strict = strict`
`166`	`166`	`),`
`167`	`167`	`add_line_break_after_pipe = if (strict) add_line_break_after_pipe,`
`168`		`- set_linebreak_after_ggplot2_plus = if (strict) {`
`169`		`- set_linebreak_after_ggplot2_plus`
	`168`	`+ set_line_break_after_ggplot2_plus = if (strict) {`
	`169`	`+ set_line_break_after_ggplot2_plus`
`170`	`170`	`}`
`171`	`171`	`)`
`172`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ test_that("tidyverse transformers are correctly dropped", {`
`76`	`76`	`"set_line_break_after_opening_if_call_is_multi_line",`
`77`	`77`	`"set_line_break_before_closing_call",`
`78`	`78`	`"remove_line_break_in_fun_call",`
`79`		`- "set_linebreak_after_ggplot2_plus"`
	`79`	`+ "set_line_break_after_ggplot2_plus"`
`80`	`80`	`)`
`81`	`81`	`expect_setequal(names(t_fun$line_break), names_line_break)`
`82`	`82`