From 2fc372413e89a20f202427cf095d037b3dada36d Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 22 Dec 2021 16:09:51 +0300 Subject: [PATCH] AbstractMany...InferenceSession -> FirInferenceSessionForChainedResolve --- .../kotlin/fir/resolve/inference/FirBuilderInferenceSession.kt | 2 +- .../resolve/inference/FirDelegatedPropertyInferenceSession.kt | 2 +- ...erenceSession.kt => FirInferenceSessionForChainedResolve.kt} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/{AbstractManyCandidatesInferenceSession.kt => FirInferenceSessionForChainedResolve.kt} (99%) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirBuilderInferenceSession.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirBuilderInferenceSession.kt index 8dbdfacf812..28714300cf5 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirBuilderInferenceSession.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirBuilderInferenceSession.kt @@ -32,7 +32,7 @@ class FirBuilderInferenceSession( private val lambda: FirAnonymousFunction, resolutionContext: ResolutionContext, private val stubsForPostponedVariables: Map, -) : AbstractManyCandidatesInferenceSession(resolutionContext) { +) : FirInferenceSessionForChainedResolve(resolutionContext) { private val commonCalls: MutableList> = mutableListOf() override val currentConstraintStorage: ConstraintStorage diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirDelegatedPropertyInferenceSession.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirDelegatedPropertyInferenceSession.kt index 0a6128491f7..843a964484a 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirDelegatedPropertyInferenceSession.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirDelegatedPropertyInferenceSession.kt @@ -26,7 +26,7 @@ class FirDelegatedPropertyInferenceSession( val property: FirProperty, resolutionContext: ResolutionContext, private val postponedArgumentsAnalyzer: PostponedArgumentsAnalyzer, -) : AbstractManyCandidatesInferenceSession(resolutionContext) { +) : FirInferenceSessionForChainedResolve(resolutionContext) { private val currentConstraintSystem = components.session.inferenceComponents.createConstraintSystem() override val currentConstraintStorage: ConstraintStorage get() = currentConstraintSystem.currentStorage() diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/AbstractManyCandidatesInferenceSession.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirInferenceSessionForChainedResolve.kt similarity index 99% rename from compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/AbstractManyCandidatesInferenceSession.kt rename to compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirInferenceSessionForChainedResolve.kt index db910c8edc3..92a12fc26cc 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/AbstractManyCandidatesInferenceSession.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/FirInferenceSessionForChainedResolve.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.resolve.calls.inference.model.InitialConstraint import org.jetbrains.kotlin.resolve.calls.inference.model.NewConstraintSystemImpl import org.jetbrains.kotlin.types.model.* -abstract class AbstractManyCandidatesInferenceSession( +abstract class FirInferenceSessionForChainedResolve( protected val resolutionContext: ResolutionContext ) : FirInferenceSession() { override fun fixSyntheticTypeVariableWithNotEnoughInformation(