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-69074 Unqualified static imports stopped working

Browse Source
This commit is contained in:
Maxim Medvedev
2011-05-03 15:45:58 +04:00
parent 87cc66f16f
commit 06b9625d50
3 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/toplevel/imports/GrImportStatementImpl.java
+29 -34
View File
@@ -75,7 +75,6 @@ public class GrImportStatementImpl extends GroovyPsiElementImpl implements GrImp
}
private boolean processDeclarationsForSingleElement(PsiScopeProcessor processor, ResolveState state) {
JavaPsiFacade facade = JavaPsiFacade.getInstance(getProject());
String name = getImportedName();
if (name == null) return true;
@@ -84,48 +83,44 @@ public class GrImportStatementImpl extends GroovyPsiElementImpl implements GrImp
GrCodeReferenceElement ref = getImportReference();
if (ref == null) return true;
String qName = ref.getCanonicalText();
if (isStatic()) {
if (qName.indexOf('.') <= 0) return true;
final int i = qName.lastIndexOf('.');
if (i > 0) {
final String classQName = qName.substring(0, i);
PsiClass clazz = facade.findClass(classQName, getResolveScope());
if (clazz != null) {
final String refName = ref.getReferenceName();
if (nameHint == null || name.equals(nameHint.getName(state))) {
final PsiField field = clazz.findFieldByName(refName, false);
if (field != null && field.hasModifierProperty(PsiModifier.STATIC)) {
if (!processor.execute(field, state)) return false;
}
GrCodeReferenceElement qualifier = ref.getQualifier();
if (qualifier == null) return true;
PsiElement resolved = qualifier.resolve();
if (!(resolved instanceof PsiClass)) return true;
PsiClass clazz = (PsiClass)resolved;
for (PsiMethod method : clazz.findMethodsByName(refName, false)) {
if (method.hasModifierProperty(PsiModifier.STATIC)) {
if (!processor.execute(method, state)) return false;
}
}
}
final String refName = ref.getReferenceName();
if (nameHint == null || name.equals(nameHint.getName(state))) {
final PsiField field = clazz.findFieldByName(refName, false);
if (field != null && field.hasModifierProperty(PsiModifier.STATIC)) {
if (!processor.execute(field, state)) return false;
}
final PsiMethod getter = GroovyPropertyUtils.findPropertyGetter(clazz, refName, true, true);
if (getter != null &&
(nameHint == null || name.equals(GroovyPropertyUtils.getPropertyNameByGetterName(nameHint.getName(state), true)))) {
if (!processor.execute(getter, state)) return false;
}
final PsiMethod setter = GroovyPropertyUtils.findPropertySetter(clazz, refName, true, true);
if (setter != null &&
(nameHint == null || name.equals(GroovyPropertyUtils.getPropertyNameBySetterName(nameHint.getName(state))))) {
if (!processor.execute(setter, state)) return false;
for (PsiMethod method : clazz.findMethodsByName(refName, false)) {
if (method.hasModifierProperty(PsiModifier.STATIC)) {
if (!processor.execute(method, state)) return false;
}
}
}
final PsiMethod getter = GroovyPropertyUtils.findPropertyGetter(clazz, refName, true, true);
if (getter != null &&
(nameHint == null || name.equals(GroovyPropertyUtils.getPropertyNameByGetterName(nameHint.getName(state), true)))) {
if (!processor.execute(getter, state)) return false;
}
final PsiMethod setter = GroovyPropertyUtils.findPropertySetter(clazz, refName, true, true);
if (setter != null &&
(nameHint == null || name.equals(GroovyPropertyUtils.getPropertyNameBySetterName(nameHint.getName(state))))) {
if (!processor.execute(setter, state)) return false;
}
}
else {
if (nameHint == null || name.equals(nameHint.getName(state))) {
PsiClass clazz = facade.findClass(qName, getResolveScope());
if (clazz != null) {
if (!processor.execute(clazz, state)) return false;
final PsiElement resolved = ref.resolve();
if (resolved instanceof PsiClass) {
if (!processor.execute(resolved, state)) return false;
}
}
}
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolveMethodTest.groovy
+9
View File
@@ -695,4 +695,13 @@ class Zoo {
final PsiElement resolved = resolve("A.groovy")
assertEquals("plus", assertInstanceOf(resolved, GrMethod).name)
}
public void testStaticImportInSamePackage() {
myFixture.addFileToProject "pack/Foo.groovy", """package pack
class Foo {
static def foo()
}"""
PsiReference ref = configureByFile("staticImportInSamePackage/A.groovy", "A.groovy");
assertNotNull(ref.resolve())
}
}
plugins/groovy/testdata/resolve/method/staticImportInSamePackage/A.groovy
Vendored
+5
View File
@@ -0,0 +1,5 @@
package pack
import static Foo.foo
print fo<ref>o()