[Analysis API] reduce memory consumption by KtFirPackageScope

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt

@@ -246,15 +246,7 @@ internal class KtFirScopeProvider(
     }
 
     private fun createPackageScope(fqName: FqName): KtFirPackageScope {
-        return KtFirPackageScope(
+        return KtFirPackageScope(fqName, analysisSession)
-            fqName,
-            project,
-            builder,
-            analysisSession.useSiteAnalysisScope,
-            analysisSession.useSiteScopeDeclarationProvider,
-            analysisSession.useSitePackageProvider,
-            analysisSession.targetPlatform
-        )
     }
 
     private fun convertToKtTypeScope(firScope: FirScope): KtTypeScope {

analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirPackageScope.kt

@@ -5,10 +5,8 @@
 
 package org.jetbrains.kotlin.analysis.api.fir.scopes
 
-import com.intellij.openapi.project.Project
 import com.intellij.psi.JavaPsiFacade
-import com.intellij.psi.search.GlobalSearchScope
+import org.jetbrains.kotlin.analysis.api.fir.KtFirAnalysisSession
-import org.jetbrains.kotlin.analysis.api.fir.KtSymbolByFirBuilder
 import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
 import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion
 import org.jetbrains.kotlin.analysis.api.scopes.KtScope
@@ -17,29 +15,21 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtClassifierSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtConstructorSymbol
 import org.jetbrains.kotlin.analysis.api.symbols.KtPackageSymbol
-import org.jetbrains.kotlin.analysis.providers.KotlinDeclarationProvider
-import org.jetbrains.kotlin.analysis.providers.KotlinPackageProvider
 import org.jetbrains.kotlin.fir.extensions.FirExtensionService
 import org.jetbrains.kotlin.fir.extensions.declarationGenerators
 import org.jetbrains.kotlin.fir.extensions.extensionService
 import org.jetbrains.kotlin.fir.scopes.impl.FirPackageMemberScope
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.platform.TargetPlatform
 
 internal class KtFirPackageScope(
     private val fqName: FqName,
-    private val project: Project,
+    private val analysisSession: KtFirAnalysisSession,
-    private val builder: KtSymbolByFirBuilder,
-    private val searchScope: GlobalSearchScope,
-    private val declarationProvider: KotlinDeclarationProvider,
-    private val packageProvider: KotlinPackageProvider,
-    private val targetPlatform: TargetPlatform,
 ) : KtScope {
-    override val token: KtLifetimeToken get() = builder.token
+    override val token: KtLifetimeToken get() = analysisSession.token
 
     private val firScope: FirPackageMemberScope by lazy(LazyThreadSafetyMode.PUBLICATION) {
-        FirPackageMemberScope(fqName, builder.rootSession)
+        FirPackageMemberScope(fqName, analysisSession.useSiteSession)
     }
 
     private val firExtensionService: FirExtensionService
@@ -47,18 +37,18 @@ internal class KtFirPackageScope(
 
     override fun getPossibleCallableNames(): Set<Name> = withValidityAssertion {
         hashSetOf<Name>().apply {
-            addAll(declarationProvider.getTopLevelCallableNamesInPackage(fqName))
+            addAll(analysisSession.useSiteScopeDeclarationProvider.getTopLevelCallableNamesInPackage(fqName))
             addAll(collectGeneratedTopLevelCallables())
         }
     }
 
     override fun getPossibleClassifierNames(): Set<Name> = withValidityAssertion {
         hashSetOf<Name>().apply {
-            addAll(declarationProvider.getTopLevelKotlinClassLikeDeclarationNamesInPackage(fqName))
+            addAll(analysisSession.useSiteScopeDeclarationProvider.getTopLevelKotlinClassLikeDeclarationNamesInPackage(fqName))
 
-            JavaPsiFacade.getInstance(project)
+            JavaPsiFacade.getInstance(analysisSession.project)
                 .findPackage(fqName.asString())
-                ?.getClasses(searchScope)
+                ?.getClasses(analysisSession.useSiteAnalysisScope)
                 ?.mapNotNullTo(this) { it.name?.let(Name::identifier) }
 
             addAll(collectGeneratedTopLevelClassifiers())
@@ -96,11 +86,11 @@ internal class KtFirPackageScope(
     }
 
     override fun getCallableSymbols(nameFilter: KtScopeNameFilter): Sequence<KtCallableSymbol> = withValidityAssertion {
-        firScope.getCallableSymbols(getPossibleCallableNames().filter(nameFilter), builder)
+        firScope.getCallableSymbols(getPossibleCallableNames().filter(nameFilter), analysisSession.firSymbolBuilder)
     }
 
     override fun getClassifierSymbols(nameFilter: KtScopeNameFilter): Sequence<KtClassifierSymbol> = withValidityAssertion {
-        firScope.getClassifierSymbols(getPossibleClassifierNames().filter(nameFilter), builder)
+        firScope.getClassifierSymbols(getPossibleClassifierNames().filter(nameFilter), analysisSession.firSymbolBuilder)
     }
 
     override fun getConstructors(): Sequence<KtConstructorSymbol> = withValidityAssertion {
@@ -109,8 +99,8 @@ internal class KtFirPackageScope(
 
     override fun getPackageSymbols(nameFilter: KtScopeNameFilter): Sequence<KtPackageSymbol> = withValidityAssertion {
         sequence {
-            packageProvider.getSubPackageFqNames(fqName, targetPlatform, nameFilter).forEach {
+            analysisSession.useSitePackageProvider.getSubPackageFqNames(fqName, analysisSession.targetPlatform, nameFilter).forEach {
-                yield(builder.createPackageSymbol(fqName.child(it)))
+                yield(analysisSession.firSymbolBuilder.createPackageSymbol(fqName.child(it)))
             }
         }
     }