Correct axis for scoped lint in implicit_assignment_linter (#2914)

* correct axis for scoped lint

* news

Author: MichaelChirico

NEWS.md

@@ -72,6 +72,7 @@ files in Windows (#2882, @Bisaloo).
 * `assignment_linter()` with `operator = "="` does a better job of skipping implicit assignments, which are intended to be governed by `implicit_assignment_linter()` (#2765, @MichaelChirico).
 * `expect_true_false_linter()` is pipe-aware, so that `42 |> expect_identical(x, ignore_attr = TRUE)` no longer lints (#1520, @MichaelChirico).
 * `T_and_F_symbol_linter()` ignores `T` and `F` used as symbols in formulas (`y ~ T + F`), which can represent variables in data not controlled by the author (#2637, @MichaelChirico).
+* `implicit_assignment_linter()` with `allow_scoped=TRUE` doesn't lint for `if (a <- 1) print(a)` (#2913, @MichaelChirico).
 
 ### Lint accuracy fixes: removing false negatives
 

R/implicit_assignment_linter.R

@@ -94,7 +94,7 @@ implicit_assignment_linter <- function(except = c("bquote", "expression", "expr"
   }
   if (allow_scoped) {
     # force 2nd preceding to ensure we're in the loop condition, not the loop expression
-    in_branch_cond <- "ancestor::expr[preceding-sibling::*[2][self::IF or self::WHILE]]"
+    in_branch_cond <- "ancestor-or-self::expr[preceding-sibling::*[2][self::IF or self::WHILE]]"
     xpath <- paste0(
       xpath,
       # _if_ we're in an IF/WHILE branch, lint if the assigned SYMBOL appears anywhere later on.

tests/testthat/test-implicit_assignment_linter.R

@@ -386,6 +386,9 @@ test_that("allow_scoped skips scoped assignments", {
     lint_message,
     linter
   )
+
+  expect_no_lint("if (a <- 1) print(a)", linter)
+
   # only applies to the branch condition itself -- within the branch, still lint
   expect_lint(
     trim_some("