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

javac ast indices: NPE in isEnabledFor() for directory fixed

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-10-28 08:56:17 +03:00
parent 32fbf57626
commit 116019cd3a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java
+4 -2
View File
@@ -34,6 +34,7 @@ import com.intellij.openapi.util.ModificationTracker;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileWithId;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiNamedElement;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.CachedValueProvider;
@@ -211,8 +212,9 @@ public class CompilerReferenceServiceImpl extends CompilerReferenceService imple
}
private boolean isServiceEnabledFor(PsiElement element) {
return isServiceEnabled() &&
!InjectedLanguageManager.getInstance(myProject).isInjectedFragment(ReadAction.compute(() -> element.getContainingFile()));
if (!isServiceEnabled()) return false;
PsiFile file = ReadAction.compute(() -> element.getContainingFile());
return file != null && !InjectedLanguageManager.getInstance(myProject).isInjectedFragment(ReadAction.compute(() -> element.getContainingFile()));
}
private boolean isServiceEnabled() {