MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-10-06 06:21:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-206722 Make SE task cancellable

Browse Source
This commit is contained in:
Mikhail Sokolov
2019-02-06 15:21:26 +03:00
parent 7e8504647a
commit 276c4a612f
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/MultiThreadSearcher.java
+21 -19
View File
@@ -6,6 +6,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.util.ProgressIndicatorBase;
import com.intellij.util.ConcurrencyUtil;
import com.intellij.util.containers.ContainerUtil;
@@ -195,26 +196,27 @@ class MultiThreadSearcher implements SESearcher {
do {
ProgressIndicator wrapperIndicator = new SensitiveProgressWrapper(myIndicator);
try {
myContributor.fetchElements(myPattern, myUseNonProjectItems, filter, wrapperIndicator,
element -> {
try {
if (element == null) {
LOG.debug("Skip null element");
return true;
}
ProgressManager.getInstance()
.runProcess(() -> myContributor.fetchElements(myPattern, myUseNonProjectItems, filter, wrapperIndicator,
element -> {
try {
if (element == null) {
LOG.debug("Skip null element");
return true;
}
int priority = myContributor.getElementPriority(element, myPattern);
boolean added = myAccumulator.addElement(element, myContributor, priority, wrapperIndicator);
if (!added) {
myAccumulator.setContributorHasMore(myContributor, true);
}
return added;
}
catch (InterruptedException e) {
LOG.warn("Search task was interrupted");
return false;
}
});
int priority = myContributor.getElementPriority(element, myPattern);
boolean added = myAccumulator.addElement(element, myContributor, priority, wrapperIndicator);
if (!added) {
myAccumulator.setContributorHasMore(myContributor, true);
}
return added;
}
catch (InterruptedException e) {
LOG.warn("Search task was interrupted");
return false;
}
}), wrapperIndicator);
}
catch (ProcessCanceledException pce) {}
repeat = !myIndicator.isCanceled() && wrapperIndicator.isCanceled();