Fix bug in SyntaxNode::isEquivalentTo

MikePopoloski · Jan 19, 2025 · 4bfd8b5 · 4bfd8b5 · MikePopoloski · Jan 19, 2025
1 parent f8fd13a
commit 4bfd8b5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/source/syntax/SyntaxNode.cpp b/source/syntax/SyntaxNode.cpp
@@ -194,12 +194,13 @@ bool SyntaxNode::isEquivalentTo(const SyntaxNode& other) const {
         else {
             Token lt = childToken(i);
             Token rt = other.childToken(i);
-
-            if (!lt)
-                return !rt;
-
-            if (lt.kind != rt.kind || lt.valueText() != rt.valueText())
+            if (bool(lt) != bool(rt))
                 return false;
+
+            if (lt) {
+                if (lt.kind != rt.kind || lt.valueText() != rt.valueText())
+                    return false;
+            }
         }
     }
     return true;

diff --git a/tests/unittests/parsing/MemberParsingTests.cpp b/tests/unittests/parsing/MemberParsingTests.cpp
@@ -1559,3 +1559,21 @@ endmodule
     REQUIRE(diagnostics.size() == 1);
     CHECK(diagnostics[0].code == diag::ExpectedToken);
 }
+
+TEST_CASE("isEquivalentTo wrong result regress") {
+    auto& text1 = R"(
+module m;
+    int i = 1;
+endmodule
+)";
+    auto& node1 = parseCompilationUnit(text1);
+
+    auto& text2 = R"(
+module n;
+    int i = 1;
+endmodule
+)";
+    auto& node2 = parseCompilationUnit(text2);
+
+    CHECK(!node1.isEquivalentTo(node2));
+}