Use node-level | for efficiency in infix_spaces_linter (#2025)

Author: MichaelChirico

R/infix_spaces_linter.R

@@ -144,11 +144,11 @@ infix_spaces_linter <- function(exclude_operators = NULL, allow_multiple_spaces
 
   # NB: preceding-sibling::* and not preceding-sibling::expr because
   #   of the foo(a=1) case, where the tree is <SYMBOL_SUB><EQ_SUB><expr>
-  # NB: position() > 1 for the unary case, e.g. x[-1]
+  # NB: parent::*[count(expr | SYMBOL_SUB)) > 1] for the unary case, e.g. x[-1]
+  #  SYMBOL_SUB for case with missing argument like alist(a =)
   # NB: the last not() disables lints inside box::use() declarations
-  xpath <- glue::glue("//*[
-    ({xp_or(paste0('self::', infix_tokens))})
-    and position() > 1
+  xpath <- paste(collapse = "|", glue::glue("//{infix_tokens}[
+    parent::*[count(expr | SYMBOL_SUB) > 1]
     and (
       (
         @line1 = preceding-sibling::*[1]/@line2
@@ -166,7 +166,7 @@ infix_spaces_linter <- function(exclude_operators = NULL, allow_multiple_spaces
         ]
       ]
     )
-  ]")
+  ]"))
 
   Linter(function(source_expression) {
     if (!is_lint_level(source_expression, "expression")) {

tests/testthat/test-infix_spaces_linter.R

@@ -185,3 +185,14 @@ test_that("native pipe is supported", {
   expect_lint("a |> foo()", NULL, linter)
   expect_lint("a|>foo()", rex::rex("Put spaces around all infix operators."), linter)
 })
+
+test_that("mixed unary & binary operators aren't mis-lint", {
+  expect_lint(
+    "-1-1",
+    list(
+      message = rex::rex("Put spaces around all infix operators."),
+      column_number = 3L
+    ),
+    infix_spaces_linter()
+  )
+})