Merge pull request #546 from lorenzwalthert/no-linebreak-with-eq-formals

- indent deeply-nested EQ_FORMALS correctly (#546).

Author: lorenzwalthert

NEWS.md

@@ -16,29 +16,32 @@
   [definition for aligned function calls](https://styler.r-lib.org/articles/detect-alignment.html)
   (#537).
 
-* curlyl-curly (`{{`) syntactic sugar introduced with rlang 0.4.0 is now
+* curly-curly (`{{`) syntactic sugar introduced with rlang 0.4.0 is now
   explicitly handled, as opposed previously where it was just treated as two
-  consequtive curly braces (#528).
+  consecutive curly braces (#528).
 
 * `style_pkg()`, `style_dir()` and the Addins can now style `.Rprofile`, and
   hidden files are now also styled (#530).
 
 ## Minor improvements and fixes
 
-* brace expressions in function calls are formatted in a less compact way. This
-  improves the formatting of `tryCatch()` in many cases (#543).
-  
-* escape characters in roxygen code examples are now correctly escaped (#512).
+* Brace expressions in function calls are formatted in a less compact way to 
+  improve readability. Typical use case: `tryCatch()` (#543).
 
-* style selection Addin now preserves line break when the last line selected is
+* Arguments in function declarations in a context which is indented multiple 
+  times should now be correct. This typically affects `R6::R6Class()` (#546).
+
+* Escape characters in roxygen code examples are now correctly escaped (#512).
+
+* Style selection Addin now preserves line break when the last line selected is
   an entire line (#520).
 
-* style file Addin can now properly handle cancelling (#511).
+* Style file Addin can now properly handle cancelling (#511).
 
 * The body of a multi-line function declaration is now indented correctly for
   `strict = FALSE` and also wrapped in curly braces for `strict = TRUE` (#536).
 
-* advice for contributors in `CONTRIBUTING.md` was updated (#508).
+* Advice for contributors in `CONTRIBUTING.md` was updated (#508).
 
 ## Adaption
 

R/visit.R

@@ -74,7 +74,9 @@ context_to_terminals <- function(pd_nested,
   }
 
   pd_transformed <- context_towards_terminals(
-    pd_nested, outer_lag_newlines, outer_indent, outer_spaces, outer_indention_refs
+    pd_nested,
+    outer_lag_newlines, outer_indent,
+    outer_spaces, outer_indention_refs
   )
 
   pd_transformed$child <- pmap(
@@ -110,7 +112,11 @@ context_towards_terminals <- function(pd_nested,
                                       outer_indent,
                                       outer_spaces,
                                       outer_indention_refs) {
-  pd_nested$indent <- pd_nested$indent + outer_indent
+  pd_nested$indent <- pd_nested$indent + ifelse(
+    is.na(pd_nested$indention_ref_pos_id),
+    outer_indent,
+    0
+  )
   ref_pos_id_is_na <- !is.na(pd_nested$indention_ref_pos_id)
   pd_nested$indention_ref_pos_id[!ref_pos_id_is_na] <- outer_indention_refs
   pd_nested$lag_newlines[1] <- pd_nested$lag_newlines[1] + outer_lag_newlines

tests/testthat/indention_operators/eq_sub_complex_indention-in.R

@@ -6,3 +6,27 @@ call(a =
        5,
      b
      )
+
+# multiple nested levels
+{
+  v <- function(x =
+  122,
+  y) {
+       }
+}
+
+
+{
+        v <- function(x = 122,
+                      y) {
+        }
+}
+
+MyClass <- R6::R6Class(
+        "MyClass",
+        public = list(initialize = function(my_arg,
+                                            my_named_arg = 1) {
+                return(invisible())
+        }
+        ),
+)

tests/testthat/indention_operators/eq_sub_complex_indention-in_tree

@@ -6,3 +6,27 @@ call(a =
   5,
 b
 )
+
+# multiple nested levels
+{
+  v <- function(x =
+                  122,
+                y) {
+  }
+}
+
+
+{
+  v <- function(x = 122,
+                y) {
+  }
+}
+
+MyClass <- R6::R6Class(
+  "MyClass",
+  public = list(initialize = function(my_arg,
+                                      my_named_arg = 1) {
+    return(invisible())
+  }
+  ),
+)