From 708e7dd11a21ae59139101733b3aae9f223d4a6b Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 7 Mar 2023 18:46:50 +0900 Subject: [PATCH] [LL API] Remove unused parameter 'librariesSessionFactory' --- .../api/fir/sessions/LLFirSessionFactory.kt | 18 ++++++------------ .../sessions/LLFirSessionProviderStorage.kt | 8 ++------ 2 files changed, 8 insertions(+), 18 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 11b65f6e3b8..3bf170f6748 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 @@ -49,8 +49,7 @@ internal object LLFirSessionFactory { module: KtSourceModule, globalResolveComponents: LLFirGlobalResolveComponents, sessionInvalidator: LLFirSessionInvalidator, - sessionsCache: MutableMap, - librariesSessionFactory: LLFirLibrarySessionFactory + sessionsCache: MutableMap ): LLFirSourcesSession { sessionsCache[module]?.let { return it as LLFirSourcesSession } checkCanceled() @@ -108,8 +107,7 @@ internal object LLFirSessionFactory { module, sessionsCache, globalResolveComponents, - sessionInvalidator, - librariesSessionFactory + sessionInvalidator ) add(builtinsSession) @@ -243,8 +241,7 @@ internal object LLFirSessionFactory { project: Project, module: KtScriptModule, sessionInvalidator: LLFirSessionInvalidator, - sessionsCache: MutableMap, - librariesSessionFactory: LLFirLibrarySessionFactory + sessionsCache: MutableMap ): LLFirScriptSession { sessionsCache[module]?.let { return it as LLFirScriptSession } checkCanceled() @@ -290,8 +287,7 @@ internal object LLFirSessionFactory { module, sessionsCache, globalResolveComponents, - sessionInvalidator, - librariesSessionFactory + sessionInvalidator ) add(builtinsSession) @@ -412,8 +408,7 @@ internal object LLFirSessionFactory { module: KtModule, sessionsCache: MutableMap, globalResolveComponents: LLFirGlobalResolveComponents, - sessionInvalidator: LLFirSessionInvalidator, - librariesSessionFactory: LLFirLibrarySessionFactory + sessionInvalidator: LLFirSessionInvalidator ) { val project = module.project @@ -433,8 +428,7 @@ internal object LLFirSessionFactory { dependency, globalResolveComponents, sessionInvalidator, - sessionsCache, - librariesSessionFactory = librariesSessionFactory + sessionsCache ) } 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 9e7b65e1b69..60fe2b1f3a3 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 @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.analysis.low.level.api.fir.sessions import com.intellij.openapi.project.Project import org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirGlobalResolveComponents import org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.LLFirBuiltinsSessionFactory -import org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.LLFirLibrarySessionFactory import org.jetbrains.kotlin.analysis.low.level.api.fir.project.structure.llFirModuleData import org.jetbrains.kotlin.analysis.low.level.api.fir.util.addValueFor import org.jetbrains.kotlin.analysis.project.structure.* @@ -19,7 +18,6 @@ class LLFirSessionProviderStorage(val project: Project) { private val libraryAsUseSiteSessionCache = LLFirSessionsCache() private val notUnderContentRootSessionCache = LLFirSessionsCache() - private val librariesSessionFactory = LLFirLibrarySessionFactory.getInstance(project) private val builtInsSessionFactory = LLFirBuiltinsSessionFactory.getInstance(project) private val globalComponents = LLFirGlobalResolveComponents(project) @@ -52,8 +50,7 @@ class LLFirSessionProviderStorage(val project: Project) { useSiteKtModule, globalComponents, sourceAsUseSiteSessionCache.sessionInvalidator, - sessions, - librariesSessionFactory + sessions ) sessions to session } @@ -84,8 +81,7 @@ class LLFirSessionProviderStorage(val project: Project) { project, useSiteKtModule, sourceAsUseSiteSessionCache.sessionInvalidator, - sessions, - librariesSessionFactory + sessions ) sessions to session }