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-153785)

Browse Source
This commit is contained in:
Daniil Ovchinnikov
2016-03-30 17:53:58 +03:00
parent 71ff1539da
commit 6cc002d3ba
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/typeEnhancers/FromStringHintProcessor.java
+8 -2
View File
@@ -92,14 +92,20 @@ class FromStringLightElement extends LightElement {
}
PsiClass containingClass = myMethod.getContainingClass();
for (PsiTypeParameter parameter : containingClass == null ? PsiTypeParameter.EMPTY_ARRAY : containingClass.getTypeParameters()) {
if (!ResolveUtil.processElement(processor, parameter, state)) return false;
if (containingClass != null) {
PsiTypeParameter[] parameters = containingClass.getTypeParameters();
for (PsiTypeParameter parameter : parameters) {
if (!ResolveUtil.processElement(processor, parameter, state)) return false;
}
}
if (!GroovyImportHelper.processImplicitImports(processor, state, lastParent, place, myFile)) {
return false;
}
// Suppose place is 'MyClass<T>' and MyClass belongs to default package.
// This reference will not be resolved, because context has no parents (it has no parents at all.
// See com.intellij.psi.impl.source.PsiJavaCodeReferenceElementImpl.OurGenericsResolver.resolve()
if (place instanceof PsiQualifiedReference) {
PsiQualifiedReference reference = (PsiQualifiedReference)place;
if (reference.getQualifier() == null && reference.getReferenceName() != null) {