azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename AbstractTypeCheckerContext to TypeCheckerState

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-08-25 12:45:24 +03:00
parent 28136d7eb0
commit 8b5548df49
37 changed files with 316 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirAnalysisSessionComponent.kt
+2 -2
View File
@@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.idea.frontend.api.KtStarProjectionTypeArgument
import org.jetbrains.kotlin.idea.frontend.api.KtTypeArgument
import org.jetbrains.kotlin.idea.frontend.api.KtTypeArgumentWithVariance
import org.jetbrains.kotlin.fir.types.ConeTypeCheckerContext
import org.jetbrains.kotlin.fir.types.ConeTypeCheckerState
import org.jetbrains.kotlin.idea.frontend.api.diagnostics.KtDiagnosticWithPsi
import org.jetbrains.kotlin.idea.frontend.api.fir.KtFirAnalysisSession
import org.jetbrains.kotlin.idea.frontend.api.fir.diagnostics.KT_DIAGNOSTIC_CONVERTER
@@ -62,7 +62,7 @@ internal interface KtFirAnalysisSessionComponent {
}
}
fun createTypeCheckerContext() = ConeTypeCheckerContext(
fun createTypeCheckerContext() = ConeTypeCheckerState(
isErrorTypeEqualsToAnything = true,
isStubTypeEqualsToAnything = true,
analysisSession.firResolveState.rootModuleSession.typeContext //TODO use correct session here
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirSubtypingComponent.kt
+2 -3
View File
@@ -13,7 +13,6 @@ import org.jetbrains.kotlin.idea.frontend.api.fir.types.KtFirType
import org.jetbrains.kotlin.idea.frontend.api.types.KtType
import org.jetbrains.kotlin.idea.frontend.api.withValidityAssertion
import org.jetbrains.kotlin.types.AbstractTypeChecker
import org.jetbrains.kotlin.types.AbstractTypeCheckerContext
internal class KtFirSubtypingComponent(
override val analysisSession: KtFirAnalysisSession,
@@ -24,7 +23,7 @@ internal class KtFirSubtypingComponent(
check(first is KtFirType)
check(second is KtFirType)
return AbstractTypeChecker.equalTypes(
createTypeCheckerContext() as AbstractTypeCheckerContext,
createTypeCheckerContext(),
first.coneType,
second.coneType
)
@@ -35,7 +34,7 @@ internal class KtFirSubtypingComponent(
check(subType is KtFirType)
check(superType is KtFirType)
return AbstractTypeChecker.isSubtypeOf(
createTypeCheckerContext() as AbstractTypeCheckerContext,
createTypeCheckerContext(),
subType.coneType,
superType.coneType
)