From bb4fb669a025ccda8b2cbfbb5d4a0aa9c90cecfa Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Tue, 20 Mar 2018 12:20:57 +0300 Subject: [PATCH] [NI] Refactoring: rename method --- .../kotlin/resolve/DelegatedPropertyInferenceSession.kt | 2 +- .../kotlin/resolve/calls/tower/ManyCandidatesResolver.kt | 2 +- .../kotlin/resolve/calls/components/InferenceSession.kt | 4 ++-- .../kotlin/resolve/calls/components/KotlinCallCompleter.kt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyInferenceSession.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyInferenceSession.kt index a6560eb70e9..24d969e6077 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyInferenceSession.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyInferenceSession.kt @@ -86,7 +86,7 @@ class DelegatedPropertyInferenceSession( } object InferenceSessionForExistingCandidates : InferenceSession { - override fun shouldFixTypeVariables(candidate: KotlinResolutionCandidate): Boolean { + override fun shouldRunCompletion(candidate: KotlinResolutionCandidate): Boolean { return !ErrorUtils.isError(candidate.resolvedCall.candidateDescriptor) } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ManyCandidatesResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ManyCandidatesResolver.kt index 0f9d98899f6..9f0a64617d5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ManyCandidatesResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ManyCandidatesResolver.kt @@ -30,7 +30,7 @@ abstract class ManyCandidatesResolver( abstract fun prepareForCompletion(commonSystem: NewConstraintSystem, resolvedCallsInfo: List) - override fun shouldFixTypeVariables(candidate: KotlinResolutionCandidate): Boolean { + override fun shouldRunCompletion(candidate: KotlinResolutionCandidate): Boolean { return false } diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/InferenceSession.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/InferenceSession.kt index fd762682d85..83c11015942 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/InferenceSession.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/InferenceSession.kt @@ -13,14 +13,14 @@ import org.jetbrains.kotlin.resolve.calls.model.PartialCallResolutionResult interface InferenceSession { companion object { val default = object : InferenceSession { - override fun shouldFixTypeVariables(candidate: KotlinResolutionCandidate): Boolean = true + override fun shouldRunCompletion(candidate: KotlinResolutionCandidate): Boolean = true override fun addPartialCallInfo(callInfo: PartialCallInfo) {} override fun addErrorCallInfo(callInfo: ErrorCallInfo) {} override fun currentConstraintSystem(): ConstraintStorage = ConstraintStorage.Empty } } - fun shouldFixTypeVariables(candidate: KotlinResolutionCandidate): Boolean + fun shouldRunCompletion(candidate: KotlinResolutionCandidate): Boolean fun addPartialCallInfo(callInfo: PartialCallInfo) fun addErrorCallInfo(callInfo: ErrorCallInfo) fun currentConstraintSystem(): ConstraintStorage diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt index 8f89a1edfa4..888e02db018 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/components/KotlinCallCompleter.kt @@ -38,7 +38,7 @@ class KotlinCallCompleter( val candidate = prepareCandidateForCompletion(factory, candidates, resolutionCallbacks) val completionType = candidate.prepareForCompletion(expectedType, resolutionCallbacks) - return if (resolutionCallbacks.inferenceSession.shouldFixTypeVariables(candidate)) + return if (resolutionCallbacks.inferenceSession.shouldRunCompletion(candidate)) candidate.runCompletion(completionType, diagnosticHolder, resolutionCallbacks) else candidate.asCallResolutionResult(ConstraintSystemCompletionMode.PARTIAL, diagnosticHolder)