FIR: remove default parameter values from FirJvmSessionFactory
Most of them are passed at all call sites anyway. Having default values makes it easy to forget to pass some meaningful argument (especially `LanguageVersionSettingsImpl.DEFAULT` seems scary), and complicates refactoring.
This commit is contained in:
committed by
Space Team
parent
bacb2f0d15
commit
d475371394
+8
-8
@@ -40,7 +40,7 @@ object FirJvmSessionFactory : FirAbstractSessionFactory() {
|
||||
scope: AbstractProjectFileSearchScope,
|
||||
packagePartProvider: PackagePartProvider,
|
||||
languageVersionSettings: LanguageVersionSettings,
|
||||
predefinedJavaComponents: FirSharableJavaComponents? = null,
|
||||
predefinedJavaComponents: FirSharableJavaComponents?,
|
||||
registerExtraComponents: ((FirSession) -> Unit),
|
||||
): FirSession {
|
||||
return createLibrarySession(
|
||||
@@ -87,14 +87,14 @@ object FirJvmSessionFactory : FirAbstractSessionFactory() {
|
||||
projectEnvironment: AbstractProjectEnvironment,
|
||||
createIncrementalCompilationSymbolProviders: (FirSession) -> FirJvmIncrementalCompilationSymbolProviders?,
|
||||
extensionRegistrars: List<FirExtensionRegistrar>,
|
||||
languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT,
|
||||
lookupTracker: LookupTracker? = null,
|
||||
enumWhenTracker: EnumWhenTracker? = null,
|
||||
importTracker: ImportTracker? = null,
|
||||
predefinedJavaComponents: FirSharableJavaComponents? = null,
|
||||
languageVersionSettings: LanguageVersionSettings,
|
||||
lookupTracker: LookupTracker?,
|
||||
enumWhenTracker: EnumWhenTracker?,
|
||||
importTracker: ImportTracker?,
|
||||
predefinedJavaComponents: FirSharableJavaComponents?,
|
||||
needRegisterJavaElementFinder: Boolean,
|
||||
registerExtraComponents: ((FirSession) -> Unit) = {},
|
||||
init: FirSessionConfigurator.() -> Unit = {}
|
||||
registerExtraComponents: ((FirSession) -> Unit),
|
||||
init: FirSessionConfigurator.() -> Unit,
|
||||
): FirSession {
|
||||
return createModuleBasedSession(
|
||||
moduleData,
|
||||
|
||||
+3
-1
@@ -59,6 +59,7 @@ object FirSessionFactoryHelper {
|
||||
librariesScope,
|
||||
packagePartProvider,
|
||||
languageVersionSettings,
|
||||
predefinedJavaComponents = null,
|
||||
registerExtraComponents = {},
|
||||
)
|
||||
|
||||
@@ -81,7 +82,8 @@ object FirSessionFactoryHelper {
|
||||
lookupTracker,
|
||||
enumWhenTracker,
|
||||
importTracker,
|
||||
needRegisterJavaElementFinder = needRegisterJavaElementFinder,
|
||||
predefinedJavaComponents = null,
|
||||
needRegisterJavaElementFinder,
|
||||
registerExtraComponents = {},
|
||||
init = sessionConfigurator,
|
||||
)
|
||||
|
||||
+6
-3
@@ -85,7 +85,7 @@ open class FirFrontendFacade(
|
||||
}
|
||||
}
|
||||
|
||||
fun registerExtraComponents(session: FirSession) {
|
||||
private fun registerExtraComponents(session: FirSession) {
|
||||
testServices.firSessionComponentRegistrar?.registerAdditionalComponent(session)
|
||||
}
|
||||
|
||||
@@ -214,7 +214,7 @@ open class FirFrontendFacade(
|
||||
projectFileSearchScope,
|
||||
packagePartProvider,
|
||||
languageVersionSettings,
|
||||
predefinedJavaComponents = predefinedJavaComponents,
|
||||
predefinedJavaComponents,
|
||||
registerExtraComponents = ::registerExtraComponents,
|
||||
)
|
||||
}
|
||||
@@ -367,7 +367,10 @@ open class FirFrontendFacade(
|
||||
createIncrementalCompilationSymbolProviders = { null },
|
||||
extensionRegistrars,
|
||||
languageVersionSettings,
|
||||
predefinedJavaComponents = predefinedJavaComponents,
|
||||
lookupTracker = null,
|
||||
enumWhenTracker = null,
|
||||
importTracker = null,
|
||||
predefinedJavaComponents,
|
||||
needRegisterJavaElementFinder = true,
|
||||
registerExtraComponents = ::registerExtraComponents,
|
||||
init = sessionConfigurator,
|
||||
|
||||
Reference in New Issue
Block a user