Merge pull request #814 from lorenzwalthert/issue-813

Indent between comment and line break

Author: lorenzwalthert

NEWS.md

@@ -55,6 +55,7 @@
 ## Minor changes and fixes
 
 * line breaks between `}` and `else` are removed (#793).
+* in function calls, code after `= #\n` is indented correctly (#814).
 * styler won't format code chunks with explicit `tidy = FALSE` in an Rmd or Rnw 
   code header anymore. This can be handy when the code can't be parsed, e.g.
   within a learnr tutorial (#790).

R/rules-indention.R

@@ -54,12 +54,21 @@ indent_op <- function(pd,
 indent_eq_sub <- function(pd,
                           indent_by,
                           token = c("EQ_SUB", "EQ_FORMALS")) {
-  eq_sub <- which(pd$token %in% token)
-  if (length(eq_sub) == 0) {
+  eq_sub <- pd$token %in% token
+  if (!any(eq_sub)) {
     return(pd)
   }
-  has_line_break <- which(pd$lag_newlines > 0)
-  indent_indices <- intersect(eq_sub + 1, has_line_break)
+  has_line_break <- pd$lag_newlines > 0 | pd$token == "COMMENT"
+  indent_indices <- which(lag(eq_sub, default = FALSE) & has_line_break)
+  if (any(pd$token[indent_indices] == "COMMENT")) {
+    indent_indices <- purrr::map_int(indent_indices, function(idx) {
+      if (pd$token[idx] == "COMMENT") {
+        next_non_comment(pd, idx)
+      } else {
+        idx
+      }
+    })
+  }
   pd$indent[indent_indices] <- pd$indent[indent_indices] + indent_by
   pd
 }

tests/testthat/indention_operators/eq_sub_complex_tokens-in.R

@@ -6,3 +6,10 @@ call(a =
        5,
      b
      )
+
+c(
+        a =
+                1,
+        b = # comment here
+                2
+)

tests/testthat/indention_operators/eq_sub_complex_tokens-in_tree

@@ -9,3 +9,10 @@ call(
     5,
   b
 )
+
+c(
+  a =
+    1,
+  b = # comment here
+    2
+)