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-90879 - NPE: PsiClassImpl.calcBasesResolveContext

Browse Source
This commit is contained in:
peter
2016-11-04 16:01:30 +01:00
parent 50b947732c
commit fe5ef6f03b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/source/PsiClassImpl.java
+3 -2
View File
@@ -557,7 +557,7 @@ public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> implements
}
@Nullable
private static PsiElement calcBasesResolveContext(PsiElement scope,
private static PsiElement calcBasesResolveContext(@NotNull PsiElement scope,
String baseClassName,
boolean isInitialClass,
final PsiElement defaultResolveContext) {
@@ -591,7 +591,8 @@ public class PsiClassImpl extends JavaStubPsiElement<PsiClassStub<?>> implements
return calcBasesResolveContext(psi, baseClassName, false, defaultResolveContext);
}
if (psi instanceof PsiMember) {
return calcBasesResolveContext(((PsiMember)psi).getContainingClass(), baseClassName, false, defaultResolveContext);
PsiClass containingClass = ((PsiMember)psi).getContainingClass();
return containingClass != null ? calcBasesResolveContext(containingClass, baseClassName, false, defaultResolveContext) : psi;
}
LOG.error(parentStub);
return psi;