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

[^maxmedvedev] fix groovy resolve SOE

Browse Source 
(cherry-picked from 17bac8e)
This commit is contained in:
peter
2012-11-23 21:51:14 +01:00
parent 89424badf0
commit a345240b37
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/GrClassImplUtil.java
+16 -10
View File
@@ -373,21 +373,27 @@ public class GrClassImplUtil {
return true;
}
private static List<PsiClass> getInnerClassesForResolve(GrTypeDefinition grType, PsiElement lastParent) {
private static List<PsiClass> getInnerClassesForResolve(final GrTypeDefinition grType, PsiElement lastParent) {
if (lastParent instanceof GrReferenceList) {
return Arrays.asList(grType.getInnerClasses());
}
List<PsiClass> result = new ArrayList<PsiClass>();
try {
for (CandidateInfo info : CollectClassMembersUtil.getAllInnerClasses(grType, false).values()) {
ContainerUtil.addIfNotNull(result, (PsiClass)info.getElement());
List<PsiClass> classes = RecursionManager.doPreventingRecursion(grType, true, new Computable<List<PsiClass>>() {
@Override
public List<PsiClass> compute() {
List<PsiClass> result = new ArrayList<PsiClass>();
for (CandidateInfo info : CollectClassMembersUtil.getAllInnerClasses(grType, false).values()) {
ContainerUtil.addIfNotNull(result, (PsiClass)info.getElement());
}
return result;
}
});
if (classes == null) {
return Arrays.asList(grType.getInnerClasses());
}
catch (StackOverflowError e) {
throw new RuntimeException("lastParent=" + lastParent, e);
}
return result;
return classes;
}
public static boolean isSameDeclaration(PsiElement place, PsiElement element) {