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

[Analysis API] reduce memory consumption by KtFirPackageScope

Browse Source
This commit is contained in:
Ilya Kirillov
2023-04-25 18:59:36 +02:00
committed by teamcity
parent aa4fe51945
commit d6e9b8b003
2 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirScopeProvider.kt
+1 -9
View File
@@ -246,15 +246,7 @@ internal class KtFirScopeProvider(
}
private fun createPackageScope(fqName: FqName): KtFirPackageScope {
return KtFirPackageScope(
fqName,
project,
builder,
analysisSession.useSiteAnalysisScope,
analysisSession.useSiteScopeDeclarationProvider,
analysisSession.useSitePackageProvider,
analysisSession.targetPlatform
)
return KtFirPackageScope(fqName, analysisSession)
}
private fun convertToKtTypeScope(firScope: FirScope): KtTypeScope {
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirPackageScope.kt
+12 -22
View File
@@ -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.KtSymbolByFirBuilder
import org.jetbrains.kotlin.analysis.api.fir.KtFirAnalysisSession
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 builder: KtSymbolByFirBuilder,
private val searchScope: GlobalSearchScope,
private val declarationProvider: KotlinDeclarationProvider,
private val packageProvider: KotlinPackageProvider,
private val targetPlatform: TargetPlatform,
private val analysisSession: KtFirAnalysisSession,
) : 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 {
yield(builder.createPackageSymbol(fqName.child(it)))
analysisSession.useSitePackageProvider.getSubPackageFqNames(fqName, analysisSession.targetPlatform, nameFilter).forEach {
yield(analysisSession.firSymbolBuilder.createPackageSymbol(fqName.child(it)))
}
}
}