From 052b6f8928dad00d0c34cf87c188766f1c8eb0cf Mon Sep 17 00:00:00 2001 From: Daniil Ovchinnikov Date: Thu, 3 Nov 2016 19:36:36 +0300 Subject: [PATCH] [groovy] follow up IDEA-CR-15243 - use green stub; - revert GrVariableBaseImpl.getVariableDeclaration(). --- .../lang/psi/impl/statements/GrVariableBaseImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableBaseImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableBaseImpl.java index 3d6809f5fb46..94e83ca48a2f 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableBaseImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableBaseImpl.java @@ -272,7 +272,7 @@ public abstract class GrVariableBaseImpl extends G @Override @NotNull public String getName() { - T stub = getStub(); + T stub = getGreenStub(); if (stub != null) { String name = stub.getName(); if (name != null) { @@ -292,7 +292,7 @@ public abstract class GrVariableBaseImpl extends G @Nullable public GrModifierList getModifierList() { final GrVariableDeclaration variableDeclaration = getDeclaration(); - if (variableDeclaration!=null) return variableDeclaration.getModifierList(); + if (variableDeclaration != null) return variableDeclaration.getModifierList(); return null; } @@ -304,7 +304,11 @@ public abstract class GrVariableBaseImpl extends G @Nullable private GrVariableDeclaration getDeclaration() { - return getStubOrPsiParentOfType(GrVariableDeclaration.class); + PsiElement parent = getParent(); + if (parent instanceof GrVariableDeclaration) { + return ((GrVariableDeclaration)parent); + } + return null; } @Override