From 34e1ab4e7a7aec7b2cc8f6000d59122ea5247270 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 11 Dec 2019 15:05:33 +0300 Subject: [PATCH] FIR: Leave single implementation of ConeInferenceContext --- .../src/org/jetbrains/kotlin/fir/SessionUtils.kt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/SessionUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/SessionUtils.kt index 51124cbe1e4..9dbb919ffc4 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/SessionUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/SessionUtils.kt @@ -11,14 +11,6 @@ import org.jetbrains.kotlin.fir.types.ConeTypeContext import org.jetbrains.kotlin.types.AbstractTypeCheckerContext import org.jetbrains.kotlin.types.model.TypeSystemContext -private class SessionBasedInferenceContext(override val session: FirSession) : ConeInferenceContext { - override fun newBaseTypeCheckerContext( - errorTypesEqualToAnything: Boolean, - stubTypesEqualToAnything: Boolean - ): AbstractTypeCheckerContext { - return ConeTypeCheckerContext(errorTypesEqualToAnything, stubTypesEqualToAnything, session) - } -} - -val FirSession.inferenceContext: ConeInferenceContext get() = SessionBasedInferenceContext(this) +val FirSession.inferenceContext: ConeInferenceContext + get() = ConeTypeCheckerContext(isErrorTypeEqualsToAnything = false, isStubTypeEqualsToAnything = false, this) val FirSession.typeContext: ConeTypeContext get() = inferenceContext