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

getContainingFile() can be null in DBE

Browse Source
This commit is contained in:
Alexey Kudravtsev
2015-10-15 15:33:40 +03:00
parent e44504f3ce
commit 80fc2b7208
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/psi/impl/ElementBase.java
+2 -3
View File
@@ -104,15 +104,14 @@ public abstract class ElementBase extends UserDataHolderBase implements Iconable
@Nullable
private Icon computeIcon(@Iconable.IconFlags int flags) {
PsiElement psiElement = (PsiElement)this;
PsiFile psiFile = psiElement.getContainingFile();
if (psiFile == null || !psiFile.isValid()) return null;
if (!psiElement.isValid()) return null;
if (Registry.is("psi.deferIconLoading")) {
Icon baseIcon = LastComputedIcon.get(psiElement, flags);
if (baseIcon == null) {
baseIcon = computeBaseIcon(flags);
}
return IconDeferrer.getInstance().defer(baseIcon, new ElementIconRequest(psiElement, psiFile.getProject(), flags), ICON_COMPUTE);
return IconDeferrer.getInstance().defer(baseIcon, new ElementIconRequest(psiElement, psiElement.getProject(), flags), ICON_COMPUTE);
}
return computeIconNow(psiElement, flags);