Remove dependency on SampleParserDefinition

antlr · Feb 18, 2016 · 57db94a · 57db94a · MichaelSnowden · May 2, 2016
1 parent 0f4e207
commit 57db94a
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/org/antlr/jetbrains/adaptor/psi/IdentifierDefSubtree.java b/src/org/antlr/jetbrains/adaptor/psi/IdentifierDefSubtree.java
@@ -6,7 +6,6 @@
 import com.intellij.psi.PsiNamedElement;
 import com.intellij.util.IncorrectOperationException;
 import org.antlr.jetbrains.adaptor.psi.ANTLRPsiNode;
-import org.antlr.jetbrains.sample.SampleParserDefinition;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -22,8 +21,15 @@
  *  for more details.
  */
 public abstract class IdentifierDefSubtree extends ANTLRPsiNode implements PsiNameIdentifierOwner {
-	public IdentifierDefSubtree(@NotNull ASTNode node) {
+	/**
+	 * Gets the {@link IElementType} of the ID/Identifier rule for
+	 * use in {@link #getNameIdentifier}
+	 */
+	private final IElementType idElementType;
+
+	public IdentifierDefSubtree(@NotNull ASTNode node, @NotNull IElementType idElementType) {
 		super(node);
+		this.idElementType = idElementType;
 	}
 
 	@Override
@@ -35,7 +41,7 @@ public String getName() {
 	@Nullable
 	@Override
 	public PsiElement getNameIdentifier() {
-		ASTNode idNode = getNode().findChildByType(SampleParserDefinition.ID);
+		ASTNode idNode = getNode().findChildByType(idElementType);
 		if (idNode != null) {
 			return idNode.getPsi();
 		}