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: EA-91164 - IAE: ProjectFileIndexImpl.$$$reportNull$$$

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-11-07 11:10:21 +03:00
parent b0ace7d217
commit 6c67c5a374
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/backwardRefs/DirtyModulesHolder.java
+12 -4
View File
@@ -31,6 +31,7 @@ import com.intellij.util.ObjectUtils;
import com.intellij.util.containers.ContainerUtil;
import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import java.util.Collections;
@@ -77,8 +78,13 @@ public class DirtyModulesHolder extends UserDataHolderBase {
if (myCompilationPhase) {
return GlobalSearchScope.allScope(project);
}
return ReadAction.compute(() -> CachedValuesManager.getManager(project).getCachedValue(this, () ->
CachedValueProvider.Result.create(calculateDirtyModules(), PsiModificationTracker.MODIFICATION_COUNT, VirtualFileManager.getInstance(), myService)));
return ReadAction.compute(() -> {
if (project.isDisposed()) {
return GlobalSearchScope.allScope(project);
}
return CachedValuesManager.getManager(project).getCachedValue(this, () ->
CachedValueProvider.Result.create(calculateDirtyModules(), PsiModificationTracker.MODIFICATION_COUNT, VirtualFileManager.getInstance(), myService));
});
}
}
@@ -162,8 +168,10 @@ public class DirtyModulesHolder extends UserDataHolderBase {
}, myService.getProject());
}
private Module getModuleForSourceContentFile(VirtualFile file) {
if (myService.getFileIndex().isInSourceContent(file) && myService.getFileTypes().contains(file.getFileType())) {
private Module getModuleForSourceContentFile(@Nullable VirtualFile file) {
if (file != null &&
myService.getFileIndex().isInSourceContent(file) &&
myService.getFileTypes().contains(file.getFileType())) {
return myService.getFileIndex().getModuleForFile(file);
}
return null;