From fe670d98a9857319120559d2063a14022073f7e8 Mon Sep 17 00:00:00 2001 From: Ivan Kochurkin Date: Sun, 2 Oct 2022 21:23:26 +0200 Subject: [PATCH] [FIR] Rename FirSessionFactory to FirJvmSessionFactory --- .../{FirSessionFactory.kt => FirJvmSessionFactory.kt} | 2 +- .../jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/{FirSessionFactory.kt => FirJvmSessionFactory.kt} (99%) diff --git a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirJvmSessionFactory.kt similarity index 99% rename from compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt rename to compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirJvmSessionFactory.kt index bc23fa02d8b..d6a6f7d8c62 100644 --- a/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirSessionFactory.kt +++ b/compiler/fir/entrypoint/src/org/jetbrains/kotlin/fir/session/FirJvmSessionFactory.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.load.kotlin.PackagePartProvider import org.jetbrains.kotlin.name.Name -object FirSessionFactory : FirAbstractSessionFactory() { +object FirJvmSessionFactory : FirAbstractSessionFactory() { fun createLibrarySession( mainModuleName: Name, sessionProvider: FirProjectSessionProvider, diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt index e1d238af36a..57d7aa56703 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/frontend/fir/FirFrontendFacade.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.FirAnalyzerFacade import org.jetbrains.kotlin.fir.checkers.registerExtendedCommonCheckers import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar import org.jetbrains.kotlin.fir.session.FirSessionConfigurator -import org.jetbrains.kotlin.fir.session.FirSessionFactory +import org.jetbrains.kotlin.fir.session.FirJvmSessionFactory import org.jetbrains.kotlin.ir.backend.js.jsResolveLibraries import org.jetbrains.kotlin.ir.backend.js.resolverLogger import org.jetbrains.kotlin.js.config.JSConfigurationKeys @@ -117,7 +117,7 @@ class FirFrontendFacade( val projectFileSearchScope = PsiBasedProjectFileSearchScope(ProjectScope.getLibrariesScope(project)) val packagePartProvider = projectEnvironment.getPackagePartProvider(projectFileSearchScope) - FirSessionFactory.createLibrarySession( + FirJvmSessionFactory.createLibrarySession( moduleName, moduleInfoProvider.firSessionProvider, dependencyList, @@ -162,7 +162,7 @@ class FirFrontendFacade( val session = when { isCommonOrJvm -> { - FirSessionFactory.createModuleBasedSession( + FirJvmSessionFactory.createModuleBasedSession( mainModuleData, moduleInfoProvider.firSessionProvider, PsiBasedProjectFileSearchScope(TopDownAnalyzerFacadeForJVM.newModuleSearchScope(project, ktFiles)),