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

[FIR] Unify FirLibrarySession and FirJavaModuleBasedSession into single FirCliSession

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-04-30 11:15:58 +03:00
committed by TeamCityServer
parent f16194e60d
commit 24f1f7b7b2
4 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt
+4 -4
View File
@@ -77,8 +77,8 @@ object FirSessionFactory {
languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT,
lookupTracker: LookupTracker? = null,
init: FirSessionConfigurator.() -> Unit = {}
): FirJavaModuleBasedSession {
return FirJavaModuleBasedSession(sessionProvider).apply session@{
): FirSession {
return FirCliSession(sessionProvider, FirCliSession.Kind.Source).apply session@{
val moduleData = FirModuleInfoBasedModuleData(moduleInfo).apply { bindSession(this@session) }
registerModuleData(moduleData)
registerCliCompilerOnlyComponents()
@@ -136,8 +136,8 @@ object FirSessionFactory {
project: Project,
packagePartProvider: PackagePartProvider,
languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT,
): FirLibrarySession {
return FirLibrarySession(sessionProvider).apply session@{
): FirSession {
return FirCliSession(sessionProvider, FirCliSession.Kind.Library).apply session@{
val moduleData = FirModuleInfoBasedModuleData(moduleInfo).apply { bindSession(this@session) }
sessionProvider.registerSession(moduleData, this)
registerCliCompilerOnlyComponents()