[FIR] Inline createModuleDataForBuiltins method since it doesn't look useful

This commit is contained in:
Ivan Kochurkin
2022-09-30 22:25:04 +02:00
committed by Space Team
parent 4d89eddbe8
commit 281c79e21e
@@ -24,8 +24,6 @@ import org.jetbrains.kotlin.fir.scopes.FirKotlinScopeProvider
import org.jetbrains.kotlin.incremental.components.EnumWhenTracker import org.jetbrains.kotlin.incremental.components.EnumWhenTracker
import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.resolve.PlatformDependentAnalyzerServices
@OptIn(PrivateSessionConstructor::class, SessionConfiguration::class) @OptIn(PrivateSessionConstructor::class, SessionConfiguration::class)
abstract class FirAbstractSessionFactory { abstract class FirAbstractSessionFactory {
@@ -51,11 +49,12 @@ abstract class FirAbstractSessionFactory {
val kotlinScopeProvider = createKotlinScopeProvider.invoke() val kotlinScopeProvider = createKotlinScopeProvider.invoke()
register(FirKotlinScopeProvider::class, kotlinScopeProvider) register(FirKotlinScopeProvider::class, kotlinScopeProvider)
val builtinsModuleData = createModuleDataForBuiltins( val builtinsModuleData = DependencyListForCliModule.createDependencyModuleData(
mainModuleName, Name.special("<builtins of ${mainModuleName.identifier}"),
moduleDataProvider.platform, moduleDataProvider.platform,
moduleDataProvider.analyzerServices moduleDataProvider.analyzerServices,
).also { it.bindSession(this@session) } )
builtinsModuleData.bindSession(this@session)
val providers = createProviders(this, builtinsModuleData, kotlinScopeProvider) val providers = createProviders(this, builtinsModuleData, kotlinScopeProvider)
@@ -65,18 +64,6 @@ abstract class FirAbstractSessionFactory {
} }
} }
private fun createModuleDataForBuiltins(
parentModuleName: Name,
platform: TargetPlatform,
analyzerServices: PlatformDependentAnalyzerServices
): FirModuleData {
return DependencyListForCliModule.createDependencyModuleData(
Name.special("<builtins of ${parentModuleName.identifier}"),
platform,
analyzerServices,
)
}
protected fun createModuleBasedSession( protected fun createModuleBasedSession(
moduleData: FirModuleData, moduleData: FirModuleData,
sessionProvider: FirProjectSessionProvider, sessionProvider: FirProjectSessionProvider,