[FIR] Move JavaTypeEnhancementState to session component

This commit is contained in:
Dmitriy Novozhilov
2021-07-09 12:06:26 +03:00
committed by teamcityserver
parent e102bdea20
commit aa3a73c6c2
5 changed files with 24 additions and 6 deletions
-1
View File
@@ -6,7 +6,6 @@ plugins {
}
dependencies {
api(project(":core:compiler.common.jvm"))
api(project(":compiler:frontend.common"))
api(project(":compiler:fir:cones"))
@@ -10,12 +10,13 @@ import org.jetbrains.kotlin.fir.utils.ArrayMapAccessor
import org.jetbrains.kotlin.fir.utils.ComponentArrayOwner
import org.jetbrains.kotlin.fir.utils.NullableArrayMapAccessor
import org.jetbrains.kotlin.fir.utils.TypeRegistry
import org.jetbrains.kotlin.load.java.JavaTypeEnhancementState
import kotlin.reflect.KClass
interface FirSessionComponent
abstract class FirSession @PrivateSessionConstructor constructor(val sessionProvider: FirSessionProvider?) : ComponentArrayOwner<FirSessionComponent, FirSessionComponent>() {
abstract class FirSession @PrivateSessionConstructor constructor(
val sessionProvider: FirSessionProvider?
) : ComponentArrayOwner<FirSessionComponent, FirSessionComponent>() {
companion object : TypeRegistry<FirSessionComponent, FirSessionComponent>() {
inline fun <reified T : FirSessionComponent> sessionComponentAccessor(): ArrayMapAccessor<FirSessionComponent, FirSessionComponent, T> {
return generateAccessor(T::class)
@@ -26,8 +27,6 @@ abstract class FirSession @PrivateSessionConstructor constructor(val sessionProv
}
}
val javaTypeEnhancementState: JavaTypeEnhancementState? get() = null
open val builtinTypes: BuiltinTypes = BuiltinTypes()
final override val typeRegistry: TypeRegistry<FirSessionComponent, FirSessionComponent> = Companion