Merge pull request #697 from lorenzwalthert/issue-696

- Allow unary + before function call (#697).

Author: lorenzwalthert

NEWS.md

@@ -25,6 +25,8 @@
 
 - `style_dir()` and `style_pkg()` now apply directory exclusion recursively with 
   `exclude_dirs` (#676).
+- unary `+` before a function call does not give an error anymore, as before 
+  version 1.3.0 (#697).
 - cache is now correctly invalidated when style guide arguments change (#647).
 - empty lines are now removed between pipes (#645).
 - overhaul pgkdown site: Add search (#623), group function in Reference (#625).

R/rules-line-break.R

@@ -286,7 +286,8 @@ remove_line_break_in_fun_call <- function(pd, strict) {
 
 
 set_linebreak_after_ggplot2_plus <- function(pd) {
-  is_plus_raw <- pd$token == "'+'"
+  # if expression is unary, first token is +. Exclude this case.
+  is_plus_raw <- c(FALSE, pd$token[-1] == "'+'")
   if (any(is_plus_raw)) {
     first_plus <- which(is_plus_raw)[1]
     next_non_comment <- next_non_comment(pd, first_plus)

tests/testthat/line_breaks_and_other/ggplot2-in.R

@@ -36,3 +36,6 @@ x[1]+ c()
 g() + x[1]
 
 g()[2] + x[1]
+
+# don't do anything on unary + and function call
++sin(x)

tests/testthat/line_breaks_and_other/ggplot2-in_tree

@@ -45,3 +45,6 @@ x[1] + c()
 g() + x[1]
 
 g()[2] + x[1]
+
+# don't do anything on unary + and function call
++sin(x)