fix failing tests

r-lib · Oct 26, 2024 · 575db33 · 575db33
1 parent 1acf920
commit 575db33
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/R/complex_conditional_linter.R b/R/complex_conditional_linter.R
@@ -73,11 +73,16 @@ complex_conditional_linter <- function(threshold = 1L) {
   stopifnot(is.integer(threshold), length(threshold) == 1L, threshold >= 1L)
 
   xpath <- glue::glue("//expr[
-    parent::*[IF or WHILE]
+    parent::expr[IF or WHILE]
     and
-    count(descendant-or-self::expr[AND2 or OR2]) > {threshold}
+    preceding-sibling::*[1][self::OP-LEFT-PAREN]
+    and
+    following-sibling::*[1][self::OP-RIGHT-PAREN]
+    and
+    count(descendant-or-self::*[AND2 or OR2]) > {threshold}
   ]")
 
+
   Linter(linter_level = "expression", function(source_expression) {
     xml <- source_expression$xml_parsed_content
 

diff --git a/tests/testthat/test-complex-conditional-linter.R b/tests/testthat/test-complex-conditional-linter.R
@@ -84,8 +84,8 @@ test_that("complex_conditional_linter handles nested conditionals", {
       }
     "),
     list(
-      list(message = lint_message, line_number = 2L),
-      list(message = lint_message, line_number = 3L)
+      list(message = lint_message, line_number = 1L),
+      list(message = lint_message, line_number = 2L)
     ),
     linter
   )