From cded565ab65ea90cc73c02940da03d30b999396d Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Tue, 18 Oct 2016 19:02:16 +0300 Subject: [PATCH] javac ast indices: do not show progress status on index up-to-date validation --- .../CompilerReferenceServiceImpl.java | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java index 1247e9344fea..34719a9bbf32 100644 --- a/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java @@ -25,9 +25,6 @@ import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.compiler.*; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.module.Module; -import com.intellij.openapi.progress.ProgressIndicator; -import com.intellij.openapi.progress.ProgressManager; -import com.intellij.openapi.progress.Task; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.roots.ProjectRootManager; @@ -133,24 +130,20 @@ public class CompilerReferenceServiceImpl extends CompilerReferenceService imple myDirtyModulesHolder.installVFSListener(); - ProgressManager.getInstance().run(new Task.Backgroundable(myProject, CompilerBundle.message("compiler.ref.service.validation.task.name")) { - @Override - public void run(@NotNull ProgressIndicator indicator) { - indicator.setText(CompilerBundle.message("compiler.ref.service.validation.progress.text")); - CompileScope projectCompileScope = compilerManager.createProjectCompileScope(myProject); - boolean isUpToDate = compilerManager.isUpToDate(projectCompileScope); - executeOnBuildThread(() -> { - if (isUpToDate) { - myDirtyModulesHolder.compilerActivityFinished(projectCompileScope.getAffectedModules(), Module.EMPTY_ARRAY); - myCompilationCount.increment(); - openReaderIfNeed(); - } - else { - myDirtyModulesHolder.compilerActivityFinished(Module.EMPTY_ARRAY, projectCompileScope.getAffectedModules()); - } - }); + ApplicationManager.getApplication().executeOnPooledThread(() -> { + CompileScope projectCompileScope = compilerManager.createProjectCompileScope(myProject); + boolean isUpToDate = compilerManager.isUpToDate(projectCompileScope); + executeOnBuildThread(() -> { + if (isUpToDate) { + myDirtyModulesHolder.compilerActivityFinished(projectCompileScope.getAffectedModules(), Module.EMPTY_ARRAY); + myCompilationCount.increment(); + openReaderIfNeed(); + } + else { + myDirtyModulesHolder.compilerActivityFinished(Module.EMPTY_ARRAY, projectCompileScope.getAffectedModules()); } }); + }); } }