Handle both positive and negative case in non_integer

r-lib · Jun 8, 2024 · 36a8c0c · 36a8c0c
1 parent 9c1aa38
commit 36a8c0c
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/R/expect_identical_linter.R b/R/expect_identical_linter.R
@@ -60,11 +60,13 @@ expect_identical_linter <- function() {
   #   - skip cases like expect_equal(x, 1.02) or the constant vector version
   #     where a numeric constant indicates inexact testing is preferable
   #   - skip calls using dots (`...`); see tests
-  non_integer <- "NUM_CONST[contains(text(), '.')]"
-  non_integer_negative <- glue::glue("
-    OP-MINUS
-    and count(expr) = 1
-    and expr[{non_integer}]
+  non_integer <- glue::glue("
+    NUM_CONST[contains(text(), '.')]
+    or (
+      OP-MINUS
+      and count(expr) = 1
+      and expr[NUM_CONST[contains(text(), '.')]]
+    )
   ")
 
   expect_equal_xpath <- glue::glue("
@@ -73,11 +75,9 @@ expect_identical_linter <- function() {
       or following-sibling::expr[
         (
           expr[1][SYMBOL_FUNCTION_CALL[text() = 'c']]
-          and expr[
-            {non_integer} or {non_integer_negative}
-          ]
+          and expr[{non_integer}]
         ) or (
-          {non_integer} or {non_integer_negative}
+          {non_integer}
         ) or (
           OP-MINUS
           and count(expr) = 1