From ab207ca58fa40b49dbb93faab7795c2eab7dc572 Mon Sep 17 00:00:00 2001
From: Victor Petukhov <victor.petukhov@jetbrains.com>
Date: Fri, 24 Dec 2021 12:43:56 +0300
Subject: [PATCH] [FE 1.0] Rename `ManyCandidatesResolver` to
 `StubTypesBasedInferenceSession`

---
 ...pertyInferenceSession.kt => DelegateInferenceSession.kt} | 6 +++---
 .../resolve/calls/inference/BuilderInferenceSession.kt      | 4 ++--
 ...didatesResolver.kt => StubTypesBasedInferenceSession.kt} | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename compiler/frontend/src/org/jetbrains/kotlin/resolve/{DelegatedPropertyInferenceSession.kt => DelegateInferenceSession.kt} (97%)
 rename compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/{ManyCandidatesResolver.kt => StubTypesBasedInferenceSession.kt} (97%)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyInferenceSession.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegateInferenceSession.kt
similarity index 97%
rename from compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyInferenceSession.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegateInferenceSession.kt
index bd63c95101c..65f2ff319f0 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyInferenceSession.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegateInferenceSession.kt
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.resolve.calls.inference.components.KotlinConstraintS
 import org.jetbrains.kotlin.resolve.calls.inference.model.ConstraintStorage
 import org.jetbrains.kotlin.resolve.calls.inference.model.DelegatedPropertyConstraintPositionImpl
 import org.jetbrains.kotlin.resolve.calls.model.*
-import org.jetbrains.kotlin.resolve.calls.tower.ManyCandidatesResolver
+import org.jetbrains.kotlin.resolve.calls.tower.StubTypesBasedInferenceSession
 import org.jetbrains.kotlin.resolve.calls.tower.PSICallResolver
 import org.jetbrains.kotlin.resolve.calls.tower.PSIPartialCallInfo
 import org.jetbrains.kotlin.types.ErrorUtils
@@ -36,11 +36,11 @@ class DelegatedPropertyInferenceSession(
     callComponents: KotlinCallComponents,
     builtIns: KotlinBuiltIns,
     override val parentSession: InferenceSession?
-) : ManyCandidatesResolver<FunctionDescriptor>(
+) : StubTypesBasedInferenceSession<FunctionDescriptor>(
     psiCallResolver, postponedArgumentsAnalyzer, kotlinConstraintSystemCompleter, callComponents, builtIns
 ) {
     init {
-        if (parentSession is ManyCandidatesResolver<*>) {
+        if (parentSession is StubTypesBasedInferenceSession<*>) {
             parentSession.addNestedInferenceSession(this)
         }
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/BuilderInferenceSession.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/BuilderInferenceSession.kt
index cd2fc988f58..717a0c0d981 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/BuilderInferenceSession.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/BuilderInferenceSession.kt
@@ -57,14 +57,14 @@ class BuilderInferenceSession(
     private val typeApproximator: TypeApproximator,
     private val missingSupertypesResolver: MissingSupertypesResolver,
     private val lambdaArgument: LambdaKotlinCallArgument
-) : ManyCandidatesResolver<CallableDescriptor>(
+) : StubTypesBasedInferenceSession<CallableDescriptor>(
     psiCallResolver, postponedArgumentsAnalyzer, kotlinConstraintSystemCompleter, callComponents, builtIns
 ) {
     private lateinit var lambda: ResolvedLambdaAtom
     private val commonSystem = NewConstraintSystemImpl(callComponents.constraintInjector, builtIns, callComponents.kotlinTypeRefiner)
 
     init {
-        if (topLevelCallContext.inferenceSession is ManyCandidatesResolver<*>) {
+        if (topLevelCallContext.inferenceSession is StubTypesBasedInferenceSession<*>) {
             topLevelCallContext.inferenceSession.addNestedInferenceSession(this)
         }
         stubsForPostponedVariables.keys.forEach(commonSystem::registerVariable)
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ManyCandidatesResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/StubTypesBasedInferenceSession.kt
similarity index 97%
rename from compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ManyCandidatesResolver.kt
rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/StubTypesBasedInferenceSession.kt
index 7e5ffd0897d..f503145f48c 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/ManyCandidatesResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/StubTypesBasedInferenceSession.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults
 import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy
 import org.jetbrains.kotlin.types.TypeConstructor
 
-abstract class ManyCandidatesResolver<D : CallableDescriptor>(
+abstract class StubTypesBasedInferenceSession<D : CallableDescriptor>(
     private val psiCallResolver: PSICallResolver,
     private val postponedArgumentsAnalyzer: PostponedArgumentsAnalyzer,
     protected val kotlinConstraintSystemCompleter: KotlinConstraintSystemCompleter,
@@ -31,9 +31,9 @@ abstract class ManyCandidatesResolver<D : CallableDescriptor>(
     protected val partiallyResolvedCallsInfo = arrayListOf<PSIPartialCallInfo>()
     private val errorCallsInfo = arrayListOf<PSIErrorCallInfo<D>>()
     private val completedCalls = hashSetOf<ResolvedAtom>()
-    protected val nestedInferenceSessions = hashSetOf<ManyCandidatesResolver<*>>()
+    protected val nestedInferenceSessions = hashSetOf<StubTypesBasedInferenceSession<*>>()
 
-    fun addNestedInferenceSession(inferenceSession: ManyCandidatesResolver<*>) {
+    fun addNestedInferenceSession(inferenceSession: StubTypesBasedInferenceSession<*>) {
         nestedInferenceSessions.add(inferenceSession)
     }