EA-32489 - assert: PsiFileImpl.getStubTree

This commit is contained in:
Alexey Kudravtsev
2011-12-14 12:22:01 +04:00
parent 233091ff90
commit 5be8bfddf9
2 changed files with 9 additions and 10 deletions
@@ -63,7 +63,11 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
return consumer.process(psiClass);
}
final PsiClass superClass = psiClass.getSuperClass();
if (superClass != null && CommonClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName())) {
if (superClass != null && CommonClassNames.JAVA_LANG_OBJECT.equals(ApplicationManager.getApplication().runReadAction(new Computable<String>() {
public String compute() {
return superClass.getQualifiedName();
}
}))) {
return consumer.process(psiClass);
}
return true;
@@ -182,9 +186,6 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
}
}
if (!sameJarClassFound) {
return ContainerUtil.process(sameNamedClasses, consumer);
}
return true;
return sameJarClassFound || ContainerUtil.process(sameNamedClasses, consumer);
}
}