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-53871: Reference to inner enum incorrectly resolved as property reference

Browse Source
This commit is contained in:
Maxim Medvedev
2010-05-29 14:20:10 +04:00
parent 865605e34c
commit e11c89c269
3 changed files with 105 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
+88 -72
View File
@@ -428,84 +428,100 @@ public class GrReferenceExpressionImpl extends GrReferenceElementImpl implements
if (propertyCandidates.length > 0) return propertyCandidates;
}
if (kind == Kind.METHOD_OR_PROPERTY) {
final PsiType[] argTypes = PsiUtil.getArgumentTypes(refExpr, false);
PsiType thisType = getThisType(refExpr);
MethodResolverProcessor methodResolver =
new MethodResolverProcessor(name, refExpr, false, thisType, argTypes, refExpr.getTypeArguments());
resolveImpl(refExpr, methodResolver);
if (methodResolver.hasApplicableCandidates()) return methodResolver.getCandidates();
final String[] names = GroovyPropertyUtils.suggestGettersName(name);
List<GroovyResolveResult> list = new ArrayList<GroovyResolveResult>();
for (String getterName : names) {
AccessorResolverProcessor getterResolver = new AccessorResolverProcessor(getterName, refExpr, true);
resolveImpl(refExpr, getterResolver);
final GroovyResolveResult[] candidates = getterResolver.getCandidates(); //can be only one candidate
if (candidates.length == 1 && candidates[0].isStaticsOK()) {
refExpr.putUserData(IS_RESOLVED_TO_GETTER, true);
return candidates;
}
else {
list.addAll(Arrays.asList(candidates));
}
}
PropertyResolverProcessor propertyResolver = new PropertyResolverProcessor(name, refExpr);
resolveImpl(refExpr, propertyResolver);
if (propertyResolver.hasCandidates()) return propertyResolver.getCandidates();
if (methodResolver.hasCandidates()) {
return methodResolver.getCandidates();
}
else if (list.size() > 0) {
refExpr.putUserData(IS_RESOLVED_TO_GETTER, true);
return list.toArray(new GroovyResolveResult[list.size()]);
}
return GroovyResolveResult.EMPTY_ARRAY;
switch (kind) {
case METHOD_OR_PROPERTY:
return resolveMethodOrProperty(refExpr, name);
case TYPE_OR_PROPERTY:
return resolveTypeOrProperty(refExpr, name);
default:
return GroovyResolveResult.EMPTY_ARRAY;
}
else if (kind == Kind.TYPE_OR_PROPERTY) {
ResolverProcessor processor = new PropertyResolverProcessor(name, refExpr);
resolveImpl(refExpr, processor);
final GroovyResolveResult[] fieldCandidates = processor.getCandidates();
}
//if reference expression is in class we need to return field instead of accessor method
for (GroovyResolveResult candidate : fieldCandidates) {
final PsiElement element = candidate.getElement();
if (element instanceof PsiField) {
final PsiClass containingClass = ((PsiField)element).getContainingClass();
if (containingClass != null && PsiTreeUtil.isAncestor(containingClass, refExpr, true)) return fieldCandidates;
} else {
return fieldCandidates;
}
private static GroovyResolveResult[] resolveTypeOrProperty(GrReferenceExpressionImpl refExpr, String name) {
EnumSet<ClassHint.ResolveKind> kinds = refExpr.getParent() instanceof GrReferenceExpression
? EnumSet.of(ClassHint.ResolveKind.CLASS, ClassHint.ResolveKind.PACKAGE)
: EnumSet.of(ClassHint.ResolveKind.CLASS);
ResolverProcessor classProcessor = new ClassResolverProcessor(refExpr.getReferenceName(), refExpr, kinds);
resolveImpl(refExpr, classProcessor);
final GroovyResolveResult[] classCandidates = classProcessor.getCandidates();
for (GroovyResolveResult classCandidate : classCandidates) {
final PsiElement element = classCandidate.getElement();
if (element instanceof PsiClass && ((PsiClass)element).isEnum()) {
return classCandidates;
}
}
final boolean isLValue = PsiUtil.isLValue(refExpr);
String[] names;
names = isLValue ? GroovyPropertyUtils.suggestSettersName(name) : GroovyPropertyUtils.suggestGettersName(name);
List<GroovyResolveResult> accessorResults = new ArrayList<GroovyResolveResult>();
for (String getterName : names) {
AccessorResolverProcessor accessorResolver = new AccessorResolverProcessor(getterName, refExpr, !isLValue);
resolveImpl(refExpr, accessorResolver);
final GroovyResolveResult[] candidates = accessorResolver.getCandidates(); //can be only one candidate
if (candidates.length == 1 && candidates[0].isStaticsOK()) {
return candidates;
}
else {
accessorResults.addAll(Arrays.asList(candidates));
}
ResolverProcessor processor = new PropertyResolverProcessor(name, refExpr);
resolveImpl(refExpr, processor);
final GroovyResolveResult[] fieldCandidates = processor.getCandidates();
//if reference expression is in class we need to return field instead of accessor method
for (GroovyResolveResult candidate : fieldCandidates) {
final PsiElement element = candidate.getElement();
if (element instanceof PsiField) {
final PsiClass containingClass = ((PsiField)element).getContainingClass();
if (containingClass != null && PsiTreeUtil.isAncestor(containingClass, refExpr, true)) return fieldCandidates;
} else {
return fieldCandidates;
}
if (fieldCandidates.length > 0) return fieldCandidates;
if (accessorResults.size() > 0) return new GroovyResolveResult[]{accessorResults.get(0)};
}
EnumSet<ClassHint.ResolveKind> kinds = refExpr.getParent() instanceof GrReferenceExpression
? EnumSet.of(ClassHint.ResolveKind.CLASS, ClassHint.ResolveKind.PACKAGE)
: EnumSet.of(ClassHint.ResolveKind.CLASS);
ResolverProcessor classProcessor = new ClassResolverProcessor(refExpr.getReferenceName(), refExpr, kinds);
resolveImpl(refExpr, classProcessor);
return classProcessor.getCandidates();
final boolean isLValue = PsiUtil.isLValue(refExpr);
String[] names;
names = isLValue ? GroovyPropertyUtils.suggestSettersName(name) : GroovyPropertyUtils.suggestGettersName(name);
List<GroovyResolveResult> accessorResults = new ArrayList<GroovyResolveResult>();
for (String getterName : names) {
AccessorResolverProcessor accessorResolver = new AccessorResolverProcessor(getterName, refExpr, !isLValue);
resolveImpl(refExpr, accessorResolver);
final GroovyResolveResult[] candidates = accessorResolver.getCandidates(); //can be only one candidate
if (candidates.length == 1 && candidates[0].isStaticsOK()) {
return candidates;
}
else {
accessorResults.addAll(Arrays.asList(candidates));
}
}
if (fieldCandidates.length > 0) return fieldCandidates;
if (accessorResults.size() > 0) return new GroovyResolveResult[]{accessorResults.get(0)};
return classCandidates;
}
private static GroovyResolveResult[] resolveMethodOrProperty(GrReferenceExpressionImpl refExpr, String name) {
final PsiType[] argTypes = PsiUtil.getArgumentTypes(refExpr, false);
PsiType thisType = getThisType(refExpr);
MethodResolverProcessor methodResolver =
new MethodResolverProcessor(name, refExpr, false, thisType, argTypes, refExpr.getTypeArguments());
resolveImpl(refExpr, methodResolver);
if (methodResolver.hasApplicableCandidates()) return methodResolver.getCandidates();
final String[] names = GroovyPropertyUtils.suggestGettersName(name);
List<GroovyResolveResult> list = new ArrayList<GroovyResolveResult>();
for (String getterName : names) {
AccessorResolverProcessor getterResolver = new AccessorResolverProcessor(getterName, refExpr, true);
resolveImpl(refExpr, getterResolver);
final GroovyResolveResult[] candidates = getterResolver.getCandidates(); //can be only one candidate
if (candidates.length == 1 && candidates[0].isStaticsOK()) {
refExpr.putUserData(IS_RESOLVED_TO_GETTER, true);
return candidates;
}
else {
list.addAll(Arrays.asList(candidates));
}
}
PropertyResolverProcessor propertyResolver = new PropertyResolverProcessor(name, refExpr);
resolveImpl(refExpr, propertyResolver);
if (propertyResolver.hasCandidates()) return propertyResolver.getCandidates();
if (methodResolver.hasCandidates()) {
return methodResolver.getCandidates();
}
else if (list.size() > 0) {
refExpr.putUserData(IS_RESOLVED_TO_GETTER, true);
return list.toArray(new GroovyResolveResult[list.size()]);
}
return GroovyResolveResult.EMPTY_ARRAY;
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveClassTest.java
+6
View File
@@ -120,6 +120,12 @@ public class ResolveClassTest extends GroovyResolveTestCase {
assertInstanceOf(resolved, PsiClass.class);
}
public void testEnumVsProperty() throws Exception {
PsiReference ref = configureByFile("enumVsProperty/Test.groovy");
final PsiElement resolved = ref.resolve();
assertInstanceOf(resolved, PsiClass.class);
}
private void doTest() throws Exception {
doTest(getTestName(true) + "/" + getTestName(false) + ".groovy");
}
plugins/groovy/testdata/resolve/class/enumVsProperty/Test.groovy
Vendored
+11
View File
@@ -0,0 +1,11 @@
class X {
def Foo
enum Foo {
a, b, c
}
def foo() {
print Fo<ref>o.a
}
}