Merge pull request #43798 from lochana-chathura/fix-nodeparser-diagno…

…stic Fix invalid token diagnostic in NodeParser
ballerina-platform · Feb 6, 2025 · c44e140 · c44e140
2 parents 71c8173 + 94b26b3
commit c44e140
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.../ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/AbstractParser.java b/.../ballerina-parser/src/main/java/io/ballerina/compiler/internal/parser/AbstractParser.java
@@ -257,7 +257,7 @@ protected STNode invalidateRestAndAddToTrailingMinutiae(STNode node) {
         while (peek().kind != SyntaxKind.EOF_TOKEN) {
             STToken invalidToken = consume();
             node = SyntaxErrors.cloneWithTrailingInvalidNodeMinutiae(node, invalidToken,
-                    DiagnosticErrorCode.ERROR_INVALID_TOKEN);
+                    DiagnosticErrorCode.ERROR_INVALID_TOKEN, invalidToken.text());
         }
 
         return node;

diff --git a/.../test/java/io/ballerinalang/compiler/parser/test/tree/nodeparser/ParseExpressionTest.java b/.../test/java/io/ballerinalang/compiler/parser/test/tree/nodeparser/ParseExpressionTest.java
@@ -151,4 +151,13 @@ public void testWithExprRecovery2() {
         Assert.assertEquals(expressionNode.trailingInvalidTokens().size(), 0);
         Assert.assertEquals(expressionNode.toString(), "foo ?  MISSING[] MISSING[:] MISSING[]");
     }
+
+    @Test
+    public void testInvalidTokenDiagnostic() {
+        ExpressionNode expressionNode = NodeParser.parseExpression("ab cd");
+        Assert.assertEquals(expressionNode.kind(), SyntaxKind.SIMPLE_NAME_REFERENCE);
+        Assert.assertTrue(expressionNode.hasDiagnostics());
+        Assert.assertEquals(expressionNode.toString(), "ab  INVALID[cd]");
+        Assert.assertEquals(expressionNode.diagnostics().iterator().next().message(), "invalid token 'cd'");
+    }
 }