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

[LL FIR] refactoring, extract duplicated code from LLFirAbstractSessionFactory

Browse Source
This commit is contained in:
Ilya Kirillov
2024-01-17 14:14:24 +01:00
committed by Space Team
parent 46d5d512e5
commit 7773fdab9a
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirAbstractSessionFactory.kt
+16 -19
View File
@@ -116,11 +116,11 @@ internal abstract class LLFirAbstractSessionFactory(protected val project: Proje
registerModuleData(moduleData) registerModuleData(moduleData)
register(FirKotlinScopeProvider::class, scopeProvider) register(FirKotlinScopeProvider::class, scopeProvider)
registerIdeComponents(project) registerAllCommonComponents(languageVersionSettings)
registerCommonComponents(languageVersionSettings)
registerCommonComponentsAfterExtensionsAreConfigured() registerCommonComponentsAfterExtensionsAreConfigured()
registerJavaComponents(JavaModuleResolver.getInstance(project)) registerJavaComponents(JavaModuleResolver.getInstance(project))
registerResolveComponents()
val provider = LLFirProvider( val provider = LLFirProvider(
this, this,
@@ -197,12 +197,11 @@ internal abstract class LLFirAbstractSessionFactory(protected val project: Proje
registerModuleData(moduleData) registerModuleData(moduleData)
register(FirKotlinScopeProvider::class, scopeProvider) register(FirKotlinScopeProvider::class, scopeProvider)
registerIdeComponents(project) registerAllCommonComponents(languageVersionSettings)
registerCommonComponents(languageVersionSettings)
registerCommonComponentsAfterExtensionsAreConfigured() registerCommonComponentsAfterExtensionsAreConfigured()
registerJavaComponents(JavaModuleResolver.getInstance(project)) registerJavaComponents(JavaModuleResolver.getInstance(project))
registerResolveComponents()
registerDefaultComponents()
val ktFile = module.file as? KtFile val ktFile = module.file as? KtFile
@@ -268,10 +267,7 @@ internal abstract class LLFirAbstractSessionFactory(protected val project: Proje
registerModuleData(moduleData) registerModuleData(moduleData)
register(FirKotlinScopeProvider::class, scopeProvider) register(FirKotlinScopeProvider::class, scopeProvider)
registerIdeComponents(project) registerAllCommonComponents(languageVersionSettings)
registerCommonComponents(languageVersionSettings)
registerResolveComponents()
registerDefaultComponents()
val firProvider = LLFirProvider( val firProvider = LLFirProvider(
this, this,
@@ -357,11 +353,8 @@ internal abstract class LLFirAbstractSessionFactory(protected val project: Proje
registerModuleData(moduleData) registerModuleData(moduleData)
register(FirKotlinScopeProvider::class, scopeProvider) register(FirKotlinScopeProvider::class, scopeProvider)
registerIdeComponents(project) registerAllCommonComponents(languageVersionSettings)
registerCommonComponents(languageVersionSettings)
registerCommonComponentsAfterExtensionsAreConfigured() registerCommonComponentsAfterExtensionsAreConfigured()
registerResolveComponents()
registerDefaultComponents()
val firProvider = LLFirProvider( val firProvider = LLFirProvider(
this, this,
@@ -490,10 +483,7 @@ internal abstract class LLFirAbstractSessionFactory(protected val project: Proje
registerModuleData(moduleData) registerModuleData(moduleData)
register(FirKotlinScopeProvider::class, scopeProvider) register(FirKotlinScopeProvider::class, scopeProvider)
registerIdeComponents(project) registerAllCommonComponents(languageVersionSettings)
registerCommonComponents(languageVersionSettings)
registerResolveComponents()
registerDefaultComponents()
val firProvider = LLFirProvider( val firProvider = LLFirProvider(
this, this,
@@ -636,6 +626,13 @@ internal abstract class LLFirAbstractSessionFactory(protected val project: Proje
return LLFirModuleData(session) return LLFirModuleData(session)
} }
private fun LLFirSession.registerAllCommonComponents(languageVersionSettings: LanguageVersionSettings) {
registerIdeComponents(project)
registerCommonComponents(languageVersionSettings)
registerResolveComponents()
registerDefaultComponents()
}
/** /**
* Merges dependency symbol providers of the same kind, and adds the result to the receiver [MutableList]. * Merges dependency symbol providers of the same kind, and adds the result to the receiver [MutableList].
* See [mergeDependencySymbolProvidersInto] for more information on symbol provider merging. * See [mergeDependencySymbolProvidersInto] for more information on symbol provider merging.