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

interruptibility

Browse Source
This commit is contained in:
Alexey Kudravtsev
2013-11-29 16:50:50 +04:00
parent 0454a91c93
commit 97b228fc22
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
+8 -1
View File
@@ -27,6 +27,7 @@ import com.intellij.openapi.fileEditor.impl.LoadTextUtil;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressIndicatorProvider;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.util.TooManyUsagesStatus;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.FileIndexFacade;
@@ -368,6 +369,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
});
if (!failedFiles.isEmpty()) {
for (final VirtualFile vfile : failedFiles) {
checkCanceled(progress);
TooManyUsagesStatus.getFrom(progress).pauseProcessingIfTooManyUsages();
// we failed to run read action in job launcher thread
// run read action in our thread instead
@@ -437,7 +439,12 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
}
private static void checkCanceled(ProgressIndicator progress) {
if (progress != null) progress.checkCanceled();
if (progress != null) {
progress.checkCanceled();
}
else {
ProgressManager.checkCanceled();
}
}
private void getFilesWithText(@NotNull GlobalSearchScope scope,