MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[groovy] follow up IDEA-CR-15243

Browse Source 
- use green stub;
- revert GrVariableBaseImpl.getVariableDeclaration().
This commit is contained in:
Daniil Ovchinnikov
2016-11-03 19:55:12 +03:00
parent 9ce27f82bd
commit 052b6f8928
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableBaseImpl.java
+7 -3
View File
@@ -272,7 +272,7 @@ public abstract class GrVariableBaseImpl<T extends GrVariableStubBase> 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<T extends GrVariableStubBase> 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<T extends GrVariableStubBase> extends G
@Nullable
private GrVariableDeclaration getDeclaration() {
return getStubOrPsiParentOfType(GrVariableDeclaration.class);
PsiElement parent = getParent();
if (parent instanceof GrVariableDeclaration) {
return ((GrVariableDeclaration)parent);
}
return null;
}
@Override