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

IDEA-90781 don't resolve variable in it's initializer

Browse Source
This commit is contained in:
Max Medvedev
2012-09-07 10:12:31 +04:00
parent 4df6e27fa1
commit 620c90b10d
3 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/api/statements/GrVariableDeclaration.java
+2
View File
@@ -24,6 +24,7 @@ public interface GrVariableDeclaration extends GrStatement, GrMembersDeclaration
@Nullable
GrTypeElement getTypeElementGroovy();
@NotNull
GrVariable[] getVariables();
void setType(@Nullable PsiType type);
@@ -33,6 +34,7 @@ public interface GrVariableDeclaration extends GrStatement, GrMembersDeclaration
@Nullable
GrTypeElement getTypeElementGroovyForVariable(GrVariable var);
@Nullable
GrTupleDeclaration getTupleDeclaration();
@Override
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrVariableDeclarationBase.java
+33 -12
View File
@@ -59,16 +59,6 @@ public abstract class GrVariableDeclarationBase extends GrStubElementBase<EmptyS
GroovyPsiElementImpl.removeStatement(this);
}
public boolean processDeclarations(@NotNull PsiScopeProcessor processor, @NotNull ResolveState state, PsiElement lastParent, @NotNull PsiElement place) {
for (final GrVariable variable : getVariables()) {
if (lastParent == variable) break;
if (lastParent instanceof GrMethod && !(variable instanceof GrField)) break;
if (!ResolveUtil.processElement(processor, variable, state)) return false;
}
return true;
}
@NotNull
public GrModifierList getModifierList() {
return (GrModifierList)findNotNullChildByType(GroovyElementTypes.MODIFIERS);
@@ -116,6 +106,7 @@ public abstract class GrVariableDeclarationBase extends GrStubElementBase<EmptyS
return getTupleDeclaration() != null;
}
@Nullable
public GrTupleDeclaration getTupleDeclaration() {
return findChildByClass(GrTupleDeclaration.class);
}
@@ -156,6 +147,7 @@ public abstract class GrVariableDeclarationBase extends GrStubElementBase<EmptyS
return "Variable definitions";
}
@NotNull
public GrVariable[] getVariables() {
return getStubOrPsiChildren(GroovyElementTypes.VARIABLES, GrVariable.ARRAY_FACTORY);
}
@@ -164,6 +156,18 @@ public abstract class GrVariableDeclarationBase extends GrStubElementBase<EmptyS
return findChildrenByClass(GrMember.class);
}
public boolean processDeclarations(@NotNull PsiScopeProcessor processor,
@NotNull ResolveState state,
PsiElement lastParent,
@NotNull PsiElement place) {
for (final GrVariable variable : getVariables()) {
if (lastParent == variable) break;
if (lastParent instanceof GrMethod && !(variable instanceof GrField)) break;
if (!ResolveUtil.processElement(processor, variable, state)) return false;
}
return true;
}
}
public static class GrMultipleVariables extends GrVariableDeclarationBase {
@@ -176,16 +180,33 @@ public abstract class GrVariableDeclarationBase extends GrStubElementBase<EmptyS
}
@Nullable
public GrExpression getInitializerGroovy(){
public GrExpression getInitializerGroovy() {
return findChildByClass(GrExpression.class);
}
@NotNull
public GrVariable[] getVariables() {
return getTupleDeclaration().getVariables();
GrTupleDeclaration declaration = getTupleDeclaration();
assert declaration != null;
return declaration.getVariables();
}
public GrMember[] getMembers() {
return GrMember.EMPTY_ARRAY;
}
public boolean processDeclarations(@NotNull PsiScopeProcessor processor,
@NotNull ResolveState state,
PsiElement lastParent,
@NotNull PsiElement place) {
if (lastParent == getInitializerGroovy()) return true;
for (final GrVariable variable : getVariables()) {
if (lastParent instanceof GrMethod && !(variable instanceof GrField)) break;
if (!ResolveUtil.processElement(processor, variable, state)) return false;
}
return true;
}
}
}
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/GroovyHighlightingTest.groovy
+4
View File
@@ -1415,4 +1415,8 @@ class X {
''')
}
void testTupleVariableDeclarationWithRecursion() {
testHighlighting('''\
def (a, b) = [a, a]''')
}
}