feat(objectionary#3744): check all parsing messages in 'eo-types'

volodya-lombrozo · Jan 15, 2025 · b496bb1 · b496bb1
1 parent 39b298a
commit b496bb1
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 6 deletions.
diff --git a/eo-parser/src/main/java/org/eolang/parser/EoParserErrors.java b/eo-parser/src/main/java/org/eolang/parser/EoParserErrors.java
@@ -87,7 +87,7 @@ public void syntaxError(
             );
         }
         final List<String> msgs = new ArrayList<>(0);
-        if (error instanceof NoViableAltException || error instanceof InputMismatchException) {
+        if (error instanceof NoViableAltException) {
             final Token token = (Token) symbol;
             final Parser parser = (Parser) recognizer;
             final String rule = parser.getRuleInvocationStack().get(0);
@@ -114,6 +114,24 @@ public void syntaxError(
                     Math.max(token.getStopIndex() - token.getStartIndex(), 1)
                 ).formatted()
             );
+        } else if (error instanceof InputMismatchException) {
+            final Token token = (Token) symbol;
+            final Parser parser = (Parser) recognizer;
+            final String rule = parser.getRuleInvocationStack().get(0);
+            final String detailed;
+            if (parser.getRuleNames()[EoParser.RULE_program].equals(rule)) {
+                detailed = "Unexpected part of the program";
+            } else {
+                detailed = msg;
+            }
+            msgs.add(new MsgLocated(line, position, detailed).formatted());
+            msgs.add(
+                new MsgUnderlined(
+                    this.lines.line(line),
+                    position,
+                    Math.max(token.getStopIndex() - token.getStartIndex(), 1)
+                ).formatted()
+            );
         } else {
             msgs.add(new MsgLocated(line, position, msg).formatted());
             msgs.add(this.lines.line(line));

diff --git a/eo-parser/src/test/java/org/eolang/parser/EoSyntaxTest.java b/eo-parser/src/test/java/org/eolang/parser/EoSyntaxTest.java
@@ -279,10 +279,10 @@ void checksTypoPacks(final String yaml) {
         if (story.map().containsKey(msg)) {
             MatcherAssert.assertThat(
                 XhtmlMatchers.xhtml(story.after()).toString(),
-                story.after()
-                    .xpath("/program/errors/error[1]/text()")
-                    .get(0)
-                    .replaceAll("\r", ""),
+                String.join(
+                    "\n",
+                    story.after().xpath("/program/errors/error/text()")
+                ).replaceAll("\r", ""),
                 Matchers.equalTo(story.map().get(msg).toString())
             );
         }

diff --git a/eo-parser/src/test/resources/org/eolang/parser/eo-typos/broken-head.yaml b/eo-parser/src/test/resources/org/eolang/parser/eo-typos/broken-head.yaml
@@ -25,6 +25,10 @@ message: |-
   [2:0] error: 'Atom must have a type'
   [] > a [] > b [] > c [] > d hello world
   ^^^^^^^
+  
+  [2:7] error: 'mismatched input '[' expecting '/''
+  [] > a [] > b [] > c [] > d hello world
+         ^
 input: |
   # No comments
   [] > a [] > b [] > c [] > d hello world
diff --git a/eo-parser/src/test/resources/org/eolang/parser/eo-typos/comment-in-method.yaml b/eo-parser/src/test/resources/org/eolang/parser/eo-typos/comment-in-method.yaml
@@ -24,9 +24,17 @@ line: 5
 # @todo #3706:30min The error message doesn't highlight the exact position of the
 #  comment. The error message should be updated to point to the exact position
 #  of the comment.
-message: |
+message: |-
   [5:12] error: 'Invalid object declaration'
       sprintwf
+  
+  [5:12] error: 'Invalid objects declaration that may be used inside abstract object'
+      sprintwf
+  
+  [4:-1] error: 'Unexpected part of the program'
+      # a comment here is prohibited
+  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
 input: |
   # No comments
   [args] > app