fix: handle cases when our lexer is instantiated before the ParserDef…

…inition (fixes #681)
antlr · Jan 9, 2024 · a67e6db · a67e6db
1 parent 4e41c9b
commit a67e6db
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/main/java/org/antlr/intellij/plugin/ANTLRv4ParserDefinition.java b/src/main/java/org/antlr/intellij/plugin/ANTLRv4ParserDefinition.java
@@ -10,26 +10,16 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.tree.IFileElementType;
 import com.intellij.psi.tree.TokenSet;
-import org.antlr.intellij.adaptor.lexer.PSIElementTypeFactory;
 import org.antlr.intellij.plugin.adaptors.ANTLRv4GrammarParser;
 import org.antlr.intellij.plugin.adaptors.ANTLRv4LexerAdaptor;
 import org.antlr.intellij.plugin.parser.ANTLRv4Lexer;
-import org.antlr.intellij.plugin.parser.ANTLRv4Parser;
 import org.jetbrains.annotations.NotNull;
 
 /** The general interface between IDEA and ANTLR. */
 public class ANTLRv4ParserDefinition implements ParserDefinition {
 	public static final IFileElementType FILE =
 		new IFileElementType(ANTLRv4Language.INSTANCE);
 
-	public ANTLRv4ParserDefinition() {
-		PSIElementTypeFactory.defineLanguageIElementTypes(
-				ANTLRv4Language.INSTANCE,
-				ANTLRv4Lexer.tokenNames,
-				ANTLRv4Parser.ruleNames
-		);
-	}
-
 	@NotNull
 	@Override
 	public Lexer createLexer(Project project) {

diff --git a/src/main/java/org/antlr/intellij/plugin/adaptors/ANTLRv4LexerAdaptor.java b/src/main/java/org/antlr/intellij/plugin/adaptors/ANTLRv4LexerAdaptor.java
@@ -1,12 +1,24 @@
 package org.antlr.intellij.plugin.adaptors;
 
 import org.antlr.intellij.adaptor.lexer.ANTLRLexerAdaptor;
+import org.antlr.intellij.adaptor.lexer.PSIElementTypeFactory;
 import org.antlr.intellij.plugin.ANTLRv4Language;
 import org.antlr.intellij.plugin.parser.ANTLRv4Lexer;
+import org.antlr.intellij.plugin.parser.ANTLRv4Parser;
 import org.antlr.v4.runtime.Lexer;
 
 /** Adapt ANTLR needs to intellij */
 public class ANTLRv4LexerAdaptor extends ANTLRLexerAdaptor {
+
+	// In case a lexer was created outside our ParserDefinition
+	static {
+		PSIElementTypeFactory.defineLanguageIElementTypes(
+				ANTLRv4Language.INSTANCE,
+				ANTLRv4Lexer.tokenNames,
+				ANTLRv4Parser.ruleNames
+		);
+	}
+
 	private static final ANTLRv4LexerState INITIAL_STATE = new ANTLRv4LexerState(Lexer.DEFAULT_MODE, null, 0);
 
 	public ANTLRv4LexerAdaptor(ANTLRv4Lexer lexer) {