Merge pull request #975 from r-lib/issue-975

Break line if indention is odd (in some cases).

Author: lorenzwalthert

NEWS.md

@@ -23,6 +23,9 @@ editor_options:
 
 -   There is now always one line break after `{` and before `#` (#916).
 
+-   Line breaks may be added to function calls to ensure indention symmetry for
+    round braces (#975).
+
 -   the cache is also invalidated on changing the stylerignore markers (#932).
 
 -   `{` is not put on a new line after `=` and in `function() {` for some edge

R/rules-line-breaks.R

@@ -311,6 +311,11 @@ set_line_break_after_opening_if_call_is_multi_line <- function(pd,
       return(pd)
     }
     break_pos <- find_line_break_position_in_multiline_call(pd)
+    idx_nested <- next_non_comment(pd, 2)
+    nested_call <- is_function_call(pd$child[[idx_nested]])
+    if (pd_is_multi_line(pd$child[[idx_nested]]) && sum(pd$lag_newlines) > 0) {
+      break_pos <- c(break_pos, idx_nested)
+    }
   }
   exception_pos <- c(
     which(pd$token %in% except_token_after),

tests/testthat/line_breaks_fun_call/unindent-in.R

@@ -0,0 +1,16 @@
+test_that(key(
+  s),x = 1)
+
+test_that(key(
+  s),
+  x = 1
+)
+
+
+test_that(key(
+  s),x = 1
+)
+
+
+test_that(
+  key(s),x = 1)

tests/testthat/line_breaks_fun_call/unindent-out.R

@@ -0,0 +1,21 @@
+test_that(key(
+  s
+), x = 1)
+
+test_that(
+  key(
+    s
+  ),
+  x = 1
+)
+
+
+test_that(key(
+  s
+), x = 1)
+
+
+test_that(
+  key(s),
+  x = 1
+)

tests/testthat/test-line_breaks_fun_call.R

@@ -55,3 +55,10 @@ test_that("line breaks work with exceptions", {
     transformer = style_text
   ), NA)
 })
+
+test_that("line breaks work with exceptions", {
+  expect_warning(test_collection("line_breaks_fun_call",
+    "unindent",
+    transformer = style_text
+  ), NA)
+})