From 97b228fc222088ea60ecb5f65502e82697d218c7 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 29 Nov 2013 13:41:34 +0400
Subject: [PATCH] interruptibility

---
 .../intellij/psi/impl/search/PsiSearchHelperImpl.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
index f0393574996a..79434f98cdf0 100644
--- a/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
+++ b/platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
@@ -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,