[FIR] Get rid of FirSession.moduleInfo

This commit is contained in:
Dmitriy Novozhilov
2021-04-30 11:11:03 +03:00
committed by TeamCityServer
parent 57a8642f5a
commit f16194e60d
19 changed files with 65 additions and 77 deletions
@@ -41,4 +41,7 @@ class FirModuleDataImpl(
override val analyzerServices: PlatformDependentAnalyzerServices
) : FirModuleData()
val FirSession.moduleData: FirModuleData by FirSession.sessionComponentAccessor()
val FirSession.nullableModuleData: FirModuleData? by FirSession.nullableSessionComponentAccessor()
val FirSession.moduleData: FirModuleData
get() = nullableModuleData ?: error("Module data is not registered in $this")
@@ -5,7 +5,6 @@
package org.jetbrains.kotlin.fir
import org.jetbrains.kotlin.analyzer.ModuleInfo
import org.jetbrains.kotlin.fir.types.impl.*
import org.jetbrains.kotlin.fir.utils.ArrayMapAccessor
import org.jetbrains.kotlin.fir.utils.ComponentArrayOwner
@@ -27,8 +26,6 @@ abstract class FirSession @PrivateSessionConstructor constructor(val sessionProv
}
}
open val moduleInfo: ModuleInfo? get() = null
val javaTypeEnhancementState: JavaTypeEnhancementState? get() = null
open val builtinTypes: BuiltinTypes = BuiltinTypes()
@@ -41,8 +38,8 @@ abstract class FirSession @PrivateSessionConstructor constructor(val sessionProv
}
}
interface FirSessionProvider {
fun getSession(moduleInfo: ModuleInfo): FirSession?
abstract class FirSessionProvider {
abstract fun getSession(moduleData: FirModuleData): FirSession?
}
class BuiltinTypes {