don't re-indent function declarations with scope < "indention"

Also reorganizing tests in new file.

Author: lorenzwalthert

R/style_guides.R

@@ -142,8 +142,8 @@ tidyverse_style <- function(scope = "tokens",
 
   indention_modifier <-
     c(
-      update_indention_ref_fun_dec,
-      NULL
+      if (scope >= "indention") update_indention_ref_fun_dec,
+      identity
     )
 
   create_style_guide(

tests/testthat/fun_dec/fun_dec_scope_spaces-in.R

@@ -0,0 +1,12 @@
+a <- function(x, #
+y
+) {
+  x - 1
+}
+
+
+a <- function(x, #
+  y) #
+{
+  x
+}

tests/testthat/fun_dec/fun_dec_scope_spaces-in_tree

@@ -0,0 +1,12 @@
+a <- function(x, #
+y
+) {
+  x - 1
+}
+
+
+a <- function(x, #
+  y) #
+{
+  x
+}

tests/testthat/fun_dec/fun_dec_scope_spaces-out.R

@@ -0,0 +1,7 @@
+test_that("reindent function declaration", {
+  expect_warning(test_collection("fun_dec", "fun_dec_scope_spaces",
+                                 transformer = style_text, scope = "spaces"), NA)
+
+  expect_warning(test_collection("fun_dec", "line_break_fun_dec",
+                                 transformer = style_text), NA)
+})

tests/testthat/line_breaks_and_other/line_break_fun_dec-in.R renamed to tests/testthat/fun_dec/line_break_fun_dec-in.R

@@ -19,9 +19,3 @@ test_that("no line break after %>% if next token is comment", {
   expect_warning(test_collection("line_breaks_and_other", "pipe_and",
                                  transformer = style_text), NA)
 })
-
-
-test_that("line break after closing brace in function calls if possible", {
-  expect_warning(test_collection("line_breaks_and_other", "line_break_fun_dec",
-                                 transformer = style_text), NA)
-})