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

[FIR] Minor: Unify all create*Session functions across all factories

Browse Source 
Rename: createJsLibrarySession -> createLibrarySession

Rename: createJsModuleBasedSession -> createModuleBasedSession
This commit is contained in:
Ivan Kochurkin
2023-02-02 14:51:33 +01:00
committed by Space Team
parent a9bac2f18b
commit 199b0e8cbe
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt
+3 -3
View File
@@ -510,7 +510,7 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
val logger = configuration.resolverLogger val logger = configuration.resolverLogger
val resolvedLibraries = jsResolveLibraries(libraries + friendLibraries, logger).getFullResolvedList() val resolvedLibraries = jsResolveLibraries(libraries + friendLibraries, logger).getFullResolvedList()
FirJsSessionFactory.createJsLibrarySession( FirJsSessionFactory.createLibrarySession(
escapedMainModuleName, escapedMainModuleName,
resolvedLibraries, resolvedLibraries,
sessionProvider, sessionProvider,
@@ -549,7 +549,7 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
} }
val commonSession = runIf(isMppEnabled) { val commonSession = runIf(isMppEnabled) {
FirJsSessionFactory.createJsModuleBasedSession( FirJsSessionFactory.createModuleBasedSession(
commonModuleData!!, commonModuleData!!,
sessionProvider, sessionProvider,
extensionRegistrars, extensionRegistrars,
@@ -559,7 +559,7 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
init = sessionConfigurator, init = sessionConfigurator,
) )
} }
val platformSession = FirJsSessionFactory.createJsModuleBasedSession( val platformSession = FirJsSessionFactory.createModuleBasedSession(
mainModuleData, mainModuleData,
sessionProvider, sessionProvider,
extensionRegistrars, extensionRegistrars,
compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirJsSessionFactory.kt
+2 -2
View File
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.library.metadata.resolver.KotlinResolvedLibrary
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
object FirJsSessionFactory : FirAbstractSessionFactory() { object FirJsSessionFactory : FirAbstractSessionFactory() {
fun createJsModuleBasedSession( fun createModuleBasedSession(
moduleData: FirModuleData, moduleData: FirModuleData,
sessionProvider: FirProjectSessionProvider, sessionProvider: FirProjectSessionProvider,
extensionRegistrars: List<FirExtensionRegistrar>, extensionRegistrars: List<FirExtensionRegistrar>,
@@ -55,7 +55,7 @@ object FirJsSessionFactory : FirAbstractSessionFactory() {
) )
} }
fun createJsLibrarySession( fun createLibrarySession(
mainModuleName: Name, mainModuleName: Name,
resolvedLibraries: List<KotlinResolvedLibrary>, resolvedLibraries: List<KotlinResolvedLibrary>,
sessionProvider: FirProjectSessionProvider, sessionProvider: FirProjectSessionProvider,
compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/TestFirJsSessionFactory.kt
+2 -2
View File
@@ -41,7 +41,7 @@ object TestFirJsSessionFactory {
val libraries = getAllJsDependenciesPaths(module, testServices) val libraries = getAllJsDependenciesPaths(module, testServices)
val resolvedLibraries = jsResolveLibraries(libraries, logger).getFullResolvedList() val resolvedLibraries = jsResolveLibraries(libraries, logger).getFullResolvedList()
return FirJsSessionFactory.createJsLibrarySession( return FirJsSessionFactory.createLibrarySession(
mainModuleName, mainModuleName,
resolvedLibraries, resolvedLibraries,
sessionProvider, sessionProvider,
@@ -57,7 +57,7 @@ object TestFirJsSessionFactory {
registerExtraComponents: ((FirSession) -> Unit), registerExtraComponents: ((FirSession) -> Unit),
sessionConfigurator: FirSessionConfigurator.() -> Unit, sessionConfigurator: FirSessionConfigurator.() -> Unit,
): FirSession = ): FirSession =
FirJsSessionFactory.createJsModuleBasedSession( FirJsSessionFactory.createModuleBasedSession(
mainModuleData, mainModuleData,
sessionProvider, sessionProvider,
extensionRegistrars, extensionRegistrars,