do check cancelled during building file map / scanning file

This commit is contained in:
Maxim.Mossienko
2013-08-22 15:44:48 +02:00
parent 48580bdb77
commit b37c6d03a1
2 changed files with 4 additions and 0 deletions
@@ -18,6 +18,7 @@ package com.intellij.ide.util.gotoByName;
import com.intellij.navigation.EfficientChooseByNameContributor;
import com.intellij.navigation.NavigationItem;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ContentIterator;
@@ -76,6 +77,7 @@ public class DefaultFileNavigationContributor implements EfficientChooseByNameCo
idSet.set(
((VirtualFileWithId)fileOrDir).getId()
);
ProgressManager.checkCanceled();
return true;
}
};
@@ -17,6 +17,7 @@
package com.intellij.util.indexing;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.util.LowMemoryWatcher;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.CommonProcessors;
@@ -252,6 +253,7 @@ public final class MapIndexStorage<Key, Value> implements IndexStorage<Key, Valu
public boolean process(int[] key) {
if (!idFilter.contains(key[1])) return true;
hashMaskSet.add(key[0]);
ProgressManager.checkCanceled();
return true;
}
});