From 206fecf872ea1c1dd844c3c4499a771978f52fb4 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Mon, 18 Jan 2016 19:41:54 +0300 Subject: [PATCH] Possible fix for KT-10603. --- .../org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt index 77bb5ecf9ef..7c0d1a111c0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.resolve.calls.tower import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind import org.jetbrains.kotlin.resolve.scopes.ImportingScope import org.jetbrains.kotlin.resolve.scopes.LexicalScope @@ -167,6 +168,8 @@ class TowerResolver { ): Collection { for (towerData in context.scopeTower.createTowerDataList()) { + ProgressIndicatorAndCompilationCanceledStatus.checkCanceled() + val candidatesGroups = if (useOrder) { processor.process(towerData) }