From 734ddc03696102fe74df46f7f983ecb14967c5a4 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 13 Apr 2020 11:43:40 +0300 Subject: [PATCH] [FIR] Rename: selectCandidateFrom... -> selectDelegatingConstructorCall --- .../src/org/jetbrains/kotlin/fir/FirCallResolver.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt index 2c1196cdfc1..d1ae3658f02 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt @@ -315,12 +315,12 @@ class FirCallResolver( candidates += candidate } } - return callResolver.selectCandidateFromGivenCandidates(delegatedConstructorCall, className, candidates) + return callResolver.selectDelegatingConstructorCall(delegatedConstructorCall, className, candidates) } - private fun selectCandidateFromGivenCandidates( - call: T, name: Name, candidates: Collection, - ): T where T : FirResolvable, T : FirCall { + private fun selectDelegatingConstructorCall( + call: FirDelegatedConstructorCall, name: Name, candidates: Collection, + ): FirDelegatedConstructorCall { val result = CandidateCollector(this, resolutionStageRunner) candidates.forEach { result.consumeCandidate(TowerGroup.Start, it) } val bestCandidates = result.bestCandidates() @@ -337,7 +337,7 @@ class FirCallResolver( result.currentApplicability, ) - return call.transformCalleeReference(StoreNameReference, nameReference) as T + return call.transformCalleeReference(StoreNameReference, nameReference) } private fun createCallableReferencesInfoForLHS(