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: do not unmark dirty module after single file compilation 2

Browse Source
This commit is contained in:
Dmitry Batkovich
2017-01-15 22:55:44 +03:00
parent b484dc4e64
commit 4ce18d0da6
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/backwardRefs/DirtyScopeHolder.java
+12 -7
View File
@@ -119,14 +119,19 @@ public class DirtyScopeHolder extends UserDataHolderBase {
void compilerActivityFinished(Module[] affectedModules) {
compilationFinished(() -> {
final ModuleManager moduleManager = ModuleManager.getInstance(myService.getProject());
final List<Module> compiledModules = myCompilationAffectedModules.stream().map(moduleManager::findModuleByName).collect(Collectors.toList());
final List<Module> compiledModules = ReadAction.compute(() -> {
final Project project = myService.getProject();
if (project.isDisposed()) {
return null;
}
final ModuleManager moduleManager = ModuleManager.getInstance(myService.getProject());
return myCompilationAffectedModules.stream().map(moduleManager::findModuleByName).collect(Collectors.toList());
});
if (compiledModules == null) return;
myVFSChangedModules.removeAll(compiledModules);
final Set<Module> unCompiledModules = ContainerUtil.newHashSet(affectedModules);
unCompiledModules.removeAll(compiledModules);
myVFSChangedModules.removeAll(unCompiledModules);
Set<Module> dirtyModulesAfterCompilation = ContainerUtil.set(affectedModules);
dirtyModulesAfterCompilation.removeAll(compiledModules);
ContainerUtil.addAll(myVFSChangedModules, dirtyModulesAfterCompilation);
});
}