From 916afddea9ac7cba77d95ef24ba83da354093bda Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Sun, 22 Nov 2009 15:36:11 +0300
Subject: [PATCH] performe checkCanceled before entering non-cancelable section

---
 .../lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
index f2f1d6db7f..cf4ca81e1a 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndex.java
@@ -61,7 +61,8 @@ import com.intellij.util.concurrency.JBLock;
 import com.intellij.util.concurrency.JBReentrantReadWriteLock;
 import com.intellij.util.concurrency.LockFactory;
 import com.intellij.util.concurrency.Semaphore;
-import com.intellij.util.containers.*;
+import com.intellij.util.containers.ConcurrentHashSet;
+import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.io.*;
 import com.intellij.util.messages.MessageBus;
 import com.intellij.util.messages.MessageBusConnection;
@@ -76,9 +77,6 @@ import org.jetbrains.annotations.TestOnly;
 import javax.swing.*;
 import java.io.*;
 import java.util.*;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Queue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.Lock;
@@ -1225,6 +1223,7 @@ private boolean indexUnsavedDocument(final Document document, final ID<?, ?> req
         tasks.add(new Runnable() {
           public void run() {
             try {
+              ProgressManager.checkCanceled();
               updateSingleIndex(indexId, file, _fc);
             }
             catch (ProcessCanceledException e) {
-- 
2.11.4.GIT