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

AnalysisScope: run read action in smart mode with everything committed (EA-65605 - INRE)

Browse Source
This commit is contained in:
peter
2015-03-18 18:33:57 +01:00
parent 111056e4e8
commit 83fa4affaa
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/analysis-api/src/com/intellij/analysis/AnalysisScope.java
+28 -8
View File
@@ -27,6 +27,7 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectCoreUtil;
import com.intellij.openapi.project.ProjectUtilCore;
@@ -419,21 +420,40 @@ public class AnalysisScope {
accessToken.finish();
}
if (needReadAction) {
PsiDocumentManager.getInstance(psiManager.getProject()).commitAndRunReadAction(new Runnable(){
@Override
public void run() {
doProcessFile(visitor, psiManager, file);
}
});
final Runnable runnable = new Runnable() {
@Override
public void run() {
doProcessFile(visitor, psiManager, file);
}
};
if (needReadAction && !ApplicationManager.getApplication().isDispatchThread()) {
commitAndRunInSmartMode(runnable, psiManager.getProject());
}
else {
doProcessFile(visitor, psiManager, file);
runnable.run();
}
final ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator();
return indicator == null || !indicator.isCanceled();
}
private static void commitAndRunInSmartMode(final Runnable runnable, final Project project) {
while (true) {
final DumbService dumbService = DumbService.getInstance(project);
dumbService.waitForSmartMode();
boolean passed = PsiDocumentManager.getInstance(project).commitAndRunReadAction(new Computable<Boolean>() {
@Override
public Boolean compute() {
if (dumbService.isDumb()) return false;
runnable.run();
return true;
}
});
if (passed) {
break;
}
}
}
protected static boolean shouldHighlightFile(@NotNull PsiFile file) {
return ProblemHighlightFilter.shouldProcessFileInBatch(file);
}