Merge pull request #3716 from volodya-lombrozo/3706_fix_token_names

feat(#3706): Use Correct Token Names
objectionary · Dec 20, 2024 · 21b1227 · 21b1227 · 0pdd · Dec 20, 2024
2 parents 05f05d9 + cfbf907
commit 21b1227
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 22 deletions.
diff --git a/eo-parser/src/main/java/org/eolang/parser/EoIndentLexer.java b/eo-parser/src/main/java/org/eolang/parser/EoIndentLexer.java
@@ -161,7 +161,7 @@ private void emitDedent(final int shift) {
      * @param type Type.
      */
     private void emitToken(final int type) {
-        final CommonToken tkn = new CommonToken(type, this.getRuleNames()[type]);
+        final CommonToken tkn = new CommonToken(type, EoParser.VOCABULARY.getSymbolicName(type));
         tkn.setLine(this.getLine() + 1);
         this.tokens.offer(tkn);
     }

diff --git a/eo-parser/src/test/java/org/eolang/parser/EoIndentLexerTest.java b/eo-parser/src/test/java/org/eolang/parser/EoIndentLexerTest.java
@@ -27,7 +27,6 @@
 import org.cactoos.text.TextOf;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -47,17 +46,7 @@ public final class EoIndentLexerTest {
      */
     public static final String TO_ADD_MESSAGE = "TO ADD ASSERTION MESSAGE";
 
-    /**
-     * Tests if the lexer emits a tab token with the correct name.
-     * @throws IOException In case if the input is invalid.
-     * @todo #3706:30min Fix the the name of the TAB token.
-     *  Currently {@link EoIndentLexer} emits TAB token with the name 'ZERO' instead of 'TAB'.
-     *  Fix the lexer to emit TAB token with the correct name.
-     *  This problem affects lexer error messages.
-     *  When this issue is fixed, remove the @Disabled annotation from the test.
-     */
     @Test
-    @Disabled
     void emitsTabWithCorrectName() throws IOException {
         MatcherAssert.assertThat(
             "We expect the token to be a tab indentation with name 'TAB'",
@@ -66,17 +55,7 @@ void emitsTabWithCorrectName() throws IOException {
         );
     }
 
-    /**
-     * Tests if the lexer emits an untab token with the correct name.
-     * @throws IOException In case if the input is invalid.
-     * @todo #3706:30min Fix the the name of the UNTAB token.
-     *  Currently {@link EoIndentLexer} emits UNTAB token with the name 'INT' instead of 'UNTAB'.
-     *  Fix the lexer to emit UNTAB token with the correct name.
-     *  This problem affects lexer error messages.
-     *  When this issue is fixed, remove the @Disabled annotation from the test.
-     */
     @Test
-    @Disabled
     void emitsUntabWithCorrectName() throws IOException {
         MatcherAssert.assertThat(
             "We expect the token to be an untab indentation with name 'UNTAB'",