From c3b2d9dc5b2e53e2711393510c8623dbb2ba07a8 Mon Sep 17 00:00:00 2001
From: Yan Zhulanow <yan.zhulanow@jetbrains.com>
Date: Tue, 7 Mar 2023 19:07:47 +0900
Subject: [PATCH] [LL API] Remove extra 'Project' parameter

---
 .../api/fir/sessions/LLFirSessionFactory.kt      | 16 ++++++----------
 .../fir/sessions/LLFirSessionProviderStorage.kt  | 15 ++-------------
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionFactory.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionFactory.kt
index b519ceb62a3..e7e7c3250bc 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionFactory.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionFactory.kt
@@ -45,7 +45,6 @@ import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatformAnalyzerServices
 @OptIn(PrivateSessionConstructor::class, SessionConfiguration::class)
 internal object LLFirSessionFactory {
     fun createSourcesSession(
-        project: Project,
         module: KtSourceModule,
         globalResolveComponents: LLFirGlobalResolveComponents,
         sessionsCache: MutableMap<KtModule, LLFirSession>
@@ -53,6 +52,7 @@ internal object LLFirSessionFactory {
         sessionsCache[module]?.let { return it as LLFirSourcesSession }
         checkCanceled()
 
+        val project = module.project
         val platform = module.platform
         val builtinsSession = LLFirBuiltinsSessionFactory.getInstance(project).getBuiltinsSession(platform)
         val languageVersionSettings = wrapLanguageVersionSettings(module.languageVersionSettings)
@@ -136,7 +136,6 @@ internal object LLFirSessionFactory {
 
 
     fun createLibraryOrLibrarySourceResolvableSession(
-        project: Project,
         module: KtModule,
         globalComponents: LLFirGlobalResolveComponents,
         builtinSession: LLFirBuiltinsAndCloneableSession,
@@ -147,6 +146,8 @@ internal object LLFirSessionFactory {
         sessionsCache[module]?.let { return it as LLFirLibraryOrLibrarySourceResolvableModuleSession }
         checkCanceled()
 
+        val project = module.project
+
         val libraryModule = when (module) {
             is KtLibraryModule -> module
             is KtLibrarySourceModule -> module.binaryLibrary
@@ -231,13 +232,13 @@ internal object LLFirSessionFactory {
     }
 
     fun createScriptSession(
-        project: Project,
         module: KtScriptModule,
         sessionsCache: MutableMap<KtModule, LLFirSession>
     ): LLFirScriptSession {
         sessionsCache[module]?.let { return it as LLFirScriptSession }
         checkCanceled()
 
+        val project = module.project
         val platform = module.platform
         val builtinsSession = LLFirBuiltinsSessionFactory.getInstance(project).getBuiltinsSession(platform)
         val languageVersionSettings = wrapLanguageVersionSettings(module.languageVersionSettings)
@@ -309,13 +310,13 @@ internal object LLFirSessionFactory {
     }
 
     fun createNotUnderContentRootResolvableSession(
-        project: Project,
         module: KtNotUnderContentRootModule,
         sessionsCache: MutableMap<KtModule, LLFirSession>
     ): LLFirNonUnderContentRootResolvableModuleSession {
         sessionsCache[module]?.let { return it as LLFirNonUnderContentRootResolvableModuleSession }
         checkCanceled()
 
+        val project = module.project
         val builtinsSession = LLFirBuiltinsSessionFactory.getInstance(project).getBuiltinsSession(JvmPlatforms.unspecifiedJvmPlatform)
         val languageVersionSettings = LanguageVersionSettingsImpl.DEFAULT
         val scopeProvider = FirKotlinScopeProvider(::wrapScopeWithJvmMapped)
@@ -412,12 +413,7 @@ internal object LLFirSessionFactory {
             }
 
             is KtSourceModule -> {
-                createSourcesSession(
-                    project,
-                    dependency,
-                    globalResolveComponents,
-                    sessionsCache
-                )
+                createSourcesSession(dependency, globalResolveComponents, sessionsCache)
             }
 
             is KtScriptModule,
diff --git a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionProviderStorage.kt b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionProviderStorage.kt
index 0499122df70..45c2c28fb22 100644
--- a/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionProviderStorage.kt
+++ b/analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionProviderStorage.kt
@@ -44,12 +44,7 @@ class LLFirSessionProviderStorage(val project: Project) {
     private fun createSessionProviderForSourceSession(useSiteKtModule: KtSourceModule): LLFirSessionProvider {
         val (sessions, session) = sourceAsUseSiteSessionCache.withMappings { mappings ->
             val sessions = mutableMapOf<KtModule, LLFirSession>().apply { putAll(mappings) }
-            val session = LLFirSessionFactory.createSourcesSession(
-                project,
-                useSiteKtModule,
-                globalComponents,
-                sessions
-            )
+            val session = LLFirSessionFactory.createSourcesSession(useSiteKtModule, globalComponents, sessions)
             sessions to session
         }
         return LLFirSessionProvider(project, session, KtModuleToSessionMappingByWeakValueMapImpl(sessions))
@@ -60,7 +55,6 @@ class LLFirSessionProviderStorage(val project: Project) {
         val (sessions, session) = libraryAsUseSiteSessionCache.withMappings { mappings ->
             val sessions = mutableMapOf<KtModule, LLFirSession>().apply { putAll(mappings) }
             val session = LLFirSessionFactory.createLibraryOrLibrarySourceResolvableSession(
-                project,
                 useSiteKtModule,
                 globalComponents,
                 builtInsSessionFactory.getBuiltinsSession(useSiteKtModule.platform),
@@ -75,7 +69,6 @@ class LLFirSessionProviderStorage(val project: Project) {
         val (sessions, session) = sourceAsUseSiteSessionCache.withMappings { mappings ->
             val sessions = mutableMapOf<KtModule, LLFirSession>().apply { putAll(mappings) }
             val session = LLFirSessionFactory.createScriptSession(
-                project,
                 useSiteKtModule,
                 sessions
             )
@@ -87,11 +80,7 @@ class LLFirSessionProviderStorage(val project: Project) {
     private fun createSessionProviderForNotUnderContentRootSession(useSiteKtModule: KtNotUnderContentRootModule): LLFirSessionProvider {
         val (sessions, session) = notUnderContentRootSessionCache.withMappings { mappings ->
             val sessions = mutableMapOf<KtModule, LLFirSession>().apply { putAll(mappings) }
-            val session = LLFirSessionFactory.createNotUnderContentRootResolvableSession(
-                project,
-                useSiteKtModule,
-                sessions
-            )
+            val session = LLFirSessionFactory.createNotUnderContentRootResolvableSession(useSiteKtModule, sessions)
             sessions to session
         }
         return LLFirSessionProvider(project, session, KtModuleToSessionMappingByWeakValueMapImpl(sessions))