Merge pull request #906 from lorenzwalthert/issue-899

Don't error on `+` in function call with line breaks and comments

Author: lorenzwalthert

NEWS.md

@@ -30,6 +30,8 @@
   anymore for one level deep (not more yet, see #889), as this can change 
   outcome of the code (#876).
 * rules that add tokens don't break stylerignore sequences anymore (#891).
+* Function calls containing `+` should no longer give any error on styling when 
+  there are comments and line breaks under certain circumstances (#905). 
 * Add vignette on distributing style guide (#846, #861).
 * Alignment detection respects stylerignore (#850).
 * `Warning: Unknown or uninitialised column:` was fixed (#885).

R/rules-line-breaks.R

@@ -349,7 +349,7 @@ set_linebreak_after_ggplot2_plus <- function(pd) {
     is_plus_or_comment_after_plus_before_fun_call <-
       lag(is_plus_raw, next_non_comment - first_plus - 1, default = FALSE) &
         (pd$token_after == "SYMBOL_FUNCTION_CALL" | pd$token_after == "SYMBOL_PACKAGE")
-    if (any(is_plus_or_comment_after_plus_before_fun_call)) {
+    if (any(is_plus_or_comment_after_plus_before_fun_call, na.rm = TRUE)) {
       gg_call <- pd$child[[previous_non_comment(pd, first_plus)]]$child[[1]]
       if (!is.null(gg_call) && isTRUE(gg_call$text[gg_call$token == "SYMBOL_FUNCTION_CALL"] == "ggplot")) {
         plus_without_comment_after <- setdiff(

tests/testthat/line_breaks_and_other/ggplot2-in.R

@@ -39,3 +39,13 @@ g()[2] + x[1]
 
 # don't do anything on unary + and function call
 +sin(x)
+
+# within function call
+qqjflk(
+  log(y + 1) +
+    # sqrt(x1) +
+    sqrt(x2) +
+    # sqrt(x3) +
+    x4 +
+    sqrt(x5)
+)