From 175fe163af9447f0f9a3fb94fd8fa3fc20c916b0 Mon Sep 17 00:00:00 2001 From: Pavel Kirpichenkov Date: Tue, 12 May 2020 20:17:51 +0300 Subject: [PATCH] Add cancelation check when building anchor mappings --- .../idea/caches/resolve/KotlinIdeResolutionAnchorService.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinIdeResolutionAnchorService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinIdeResolutionAnchorService.kt index 1279308badf..6df36e36e52 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinIdeResolutionAnchorService.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinIdeResolutionAnchorService.kt @@ -18,6 +18,7 @@ import org.jetbrains.kotlin.caches.resolve.KotlinCacheService import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.idea.caches.project.* import org.jetbrains.kotlin.idea.project.libraryToSourceAnalysisEnabled +import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus import org.jetbrains.kotlin.resolve.ResolutionAnchorProvider @State(name = "KotlinIdeAnchorService", storages = [Storage("anchors.xml")]) @@ -36,7 +37,8 @@ class KotlinIdeResolutionAnchorService( var myState: State = State() private fun buildMapping(): Map { - val modulesByNames = getModuleInfosFromIdeaModel(project).associateBy { moduleInfo -> + val modulesByNames = getModuleInfosFromIdeaModel(project).associateBy { moduleInfo -> + ProgressIndicatorAndCompilationCanceledStatus.checkCanceled() when (moduleInfo) { is LibraryInfo -> moduleInfo.library.name is ModuleSourceInfo -> moduleInfo.module.name