From ef567c868eb1bec870fdf9cd6800d985e83173c5 Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Wed, 20 Nov 2019 15:23:11 +0300 Subject: [PATCH] [NI] Add `checkCanceled` checks before resolving a candidate This is an analogue that was done for old inference in CandidateResolver --- .../org/jetbrains/kotlin/resolve/calls/KotlinCallResolver.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/KotlinCallResolver.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/KotlinCallResolver.kt index d3ec72e75b9..66264909045 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/KotlinCallResolver.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/KotlinCallResolver.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.resolve.calls import org.jetbrains.kotlin.config.LanguageFeature +import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus import org.jetbrains.kotlin.resolve.calls.components.CallableReferenceResolver import org.jetbrains.kotlin.resolve.calls.components.KotlinCallCompleter import org.jetbrains.kotlin.resolve.calls.components.KotlinResolutionCallbacks @@ -45,6 +46,8 @@ class KotlinCallResolver( collectAllCandidates: Boolean, createFactoryProviderForInvoke: () -> CandidateFactoryProviderForInvoke ): CallResolutionResult { + ProgressIndicatorAndCompilationCanceledStatus.checkCanceled() + kotlinCall.checkCallInvariants() val candidateFactory = SimpleCandidateFactory( @@ -99,6 +102,8 @@ class KotlinCallResolver( givenCandidates: Collection, collectAllCandidates: Boolean ): CallResolutionResult { + ProgressIndicatorAndCompilationCanceledStatus.checkCanceled() + kotlinCall.checkCallInvariants() val candidateFactory = SimpleCandidateFactory( callComponents, scopeTower, kotlinCall, resolutionCallbacks, callableReferenceResolver