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

add some checkCanceled to async console filters (IDEA-163365)

Browse Source
This commit is contained in:
peter
2016-11-03 10:53:15 +01:00
parent def70549c3
commit 4a5849f077
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/execution/filters/CompositeFilter.java
+2
View File
@@ -18,6 +18,7 @@ package com.intellij.execution.filters;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.TextRange;
@@ -54,6 +55,7 @@ public class CompositeFilter implements Filter, FilterMixin {
List<ResultItem> resultItems = null;
for (int i = 0; i < count; i++) {
ProgressManager.checkCanceled();
Filter filter = filters.get(i);
if (!dumb || DumbService.isDumbAware(filter)) {
long t0 = System.currentTimeMillis();
platform/platform-impl/src/com/intellij/execution/impl/AsyncFilterRunner.java
+2
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.RangeMarker;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.util.ProgressIndicatorUtils;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.NullableComputable;
@@ -133,6 +134,7 @@ class AsyncFilterRunner {
return () -> {
List<Filter.Result> results = new ArrayList<>();
for (LineHighlighter task : tasks) {
ProgressManager.checkCanceled();
if (!marker.isValid()) return FilterResults.EMPTY;
ContainerUtil.addIfNotNull(results, task.compute());
}