Merge pull request #915 from lorenzwalthert/issue-909

respect `indent_by` when curly brace is added

Author: lorenzwalthert

NEWS.md

@@ -47,6 +47,8 @@
 * Preserve trailing blank line in roxygen examples to simplify concatenation of
   examples (#880).
 * added guarantee that styled code is parsable (#892).
+* `indenty_by` is now also respected when curly braces are added to an if
+  statement by {styler} (#915).
 * An error is now thrown on styling if input unicode characters can't be 
   correctly parsed for Windows and R < 4.2 (#883).
 * styling of text does not error anymore when the R option `OutDec` is set to 

R/style-guides.R

@@ -169,7 +169,12 @@ tidyverse_style <- function(scope = "tokens",
       resolve_semicolon = resolve_semicolon,
       add_brackets_in_pipe = add_brackets_in_pipe,
       wrap_if_else_while_for_fun_multi_line_in_curly =
-        if (strict) wrap_if_else_while_for_fun_multi_line_in_curly
+        if (strict) {
+          purrr::partial(
+            wrap_if_else_while_for_fun_multi_line_in_curly,
+            indent_by = indent_by
+          )
+        }
     )
   }
 

tests/testthat/indention_curly_brackets/custom-in.R

@@ -0,0 +1,10 @@
+
+value <- 5
+if (value > 0)
+    print(value)
+
+
+
+if (value > 0) {
+print(value)
+}

tests/testthat/indention_curly_brackets/custom-in_tree

@@ -0,0 +1,11 @@
+
+value <- 5
+if (value > 0) {
+    print(value)
+}
+
+
+
+if (value > 0) {
+    print(value)
+}

tests/testthat/indention_curly_brackets/custom-out.R

@@ -22,6 +22,13 @@ test_that("indention with multi-line curley and round is correct", {
   ), NA)
 })
 
+test_that("custom indention for curly braces is corretct ", {
+  expect_warning(test_collection("indention_curly_brackets",
+    "custom",
+    transformer = style_text, indent_by = 4
+  ), NA)
+})
+
 
 
 test_that(paste(