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

EA-32489 - assert: PsiFileImpl.getStubTree

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
+6 -5
View File
@@ -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);
}
}
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
+3 -5
View File
@@ -168,14 +168,12 @@ public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> implements
PsiElement parent = getParent();
if (parent instanceof PsiJavaFile) {
String packageName = ((PsiJavaFile)parent).getPackageName();
if (packageName.length() > 0) {
return packageName + "." + getName();
}
else {
if (packageName.isEmpty()) {
return getName();
}
return packageName + "." + getName();
}
else if (parent instanceof PsiClass) {
if (parent instanceof PsiClass) {
String parentQName = ((PsiClass)parent).getQualifiedName();
if (parentQName == null) return null;
return parentQName + "." + getName();