Fix RsLexer state and token name conflict

waleedyaseen · Oct 15, 2023 · 86874a5 · 86874a5
1 parent fc629fb
commit 86874a5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/main/gen/io/runescript/plugin/lang/lexer/_RsLexer.java b/src/main/gen/io/runescript/plugin/lang/lexer/_RsLexer.java
@@ -6,7 +6,7 @@
 import com.intellij.lexer.FlexLexer;
 import com.intellij.psi.TokenType;
 import com.intellij.psi.tree.IElementType;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
+import io.runescript.plugin.lang.psi.RsTokenTypes;import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntStack;
 
 import java.util.List;
@@ -655,7 +655,7 @@ else if (zzAtEOF) {
             switch (zzLexicalState) {
             case BLOCK_COMMENT: {
               popState();
-    return BLOCK_COMMENT;
+    return RsTokenTypes.BLOCK_COMMENT;
             }  // fall though
             case 133: break;
             default:
@@ -886,7 +886,7 @@ else if (zzAtEOF) {
           case 86: break;
           case 37:
             { popState();
-    return BLOCK_COMMENT;
+    return RsTokenTypes.BLOCK_COMMENT;
             }
           // fall through
           case 87: break;
@@ -901,7 +901,7 @@ else if (zzAtEOF) {
           // fall through
           case 89: break;
           case 40:
-            { return BLOCK_COMMENT;
+            { return RsTokenTypes.BLOCK_COMMENT;
             }
           // fall through
           case 90: break;

diff --git a/src/main/grammars/RuneScript.flex b/src/main/grammars/RuneScript.flex
@@ -3,6 +3,7 @@ package io.runescript.plugin.lang.lexer;
 import com.intellij.lexer.FlexLexer;
 import com.intellij.psi.TokenType;
 import com.intellij.psi.tree.IElementType;
+import io.runescript.plugin.lang.psi.RsTokenTypes;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntStack;
 
@@ -65,19 +66,19 @@ INCOMPLETE_TAG = "<"(shad|col|str|u|img)"="
 <BLOCK_COMMENT> {
 "*/" {
     popState();
-    return BLOCK_COMMENT;
+    return RsTokenTypes.BLOCK_COMMENT;
 }
 <<EOF>> {
     popState();
-    return BLOCK_COMMENT;
+    return RsTokenTypes.BLOCK_COMMENT;
 }
 [\s\S] { }
 }
 
 <YYINITIAL,STRING_INTERPOLATION> {
 
 // Comments
-"/**/" { return BLOCK_COMMENT; }
+"/**/" { return RsTokenTypes.BLOCK_COMMENT; }
 "/*" { pushState(BLOCK_COMMENT); }
 
 {LINE_COMMENT} { return LINE_COMMENT; }