[Analysis API] add KtScope.getCallableSymbols/getClassifier symbols overloads which accept a candidate name set

This is needed for the cases when a candidate name set is known
 to avoid retrieving a set with all possible names when processing the scope.

^KT-58653 fixed
This commit is contained in:
Ilya Kirillov
2023-05-12 11:05:15 +02:00
committed by Space Team
parent aacdfb67c6
commit 29be88e3c9
12 changed files with 154 additions and 9 deletions
@@ -8,14 +8,14 @@ package org.jetbrains.kotlin.analysis.api.descriptors.scopes
import org.jetbrains.kotlin.analysis.api.descriptors.Fe10AnalysisContext
import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtCallableSymbol
import org.jetbrains.kotlin.analysis.api.descriptors.symbols.descriptorBased.base.toKtClassifierSymbol
import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion
import org.jetbrains.kotlin.analysis.api.scopes.KtScope
import org.jetbrains.kotlin.analysis.api.scopes.KtScopeNameFilter
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.api.lifetime.KtLifetimeToken
import org.jetbrains.kotlin.analysis.api.lifetime.withValidityAssertion
import org.jetbrains.kotlin.descriptors.CallableDescriptor
import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
import org.jetbrains.kotlin.name.Name
@@ -51,6 +51,12 @@ internal class KtFe10FileScope(
}
}
override fun getCallableSymbols(names: Collection<Name>): Sequence<KtCallableSymbol> {
if (names.isEmpty()) return emptySequence()
val namesSet = names.toSet()
return getCallableSymbols { it in namesSet }
}
override fun getClassifierSymbols(nameFilter: KtScopeNameFilter): Sequence<KtClassifierSymbol> = withValidityAssertion {
val context = analysisContext.analyze(ktFile)
@@ -65,6 +71,12 @@ internal class KtFe10FileScope(
}
}
override fun getClassifierSymbols(names: Collection<Name>): Sequence<KtClassifierSymbol> {
if (names.isEmpty()) return emptySequence()
val namesSet = names.toSet()
return getClassifierSymbols { it in namesSet }
}
override fun getConstructors(): Sequence<KtConstructorSymbol> = withValidityAssertion {
emptySequence()
}
@@ -34,6 +34,12 @@ internal abstract class KtFe10ScopeResolution : KtScope, KtLifetimeOwner {
.mapNotNull { it.toKtSymbol(analysisContext) as? KtCallableSymbol }
}
override fun getCallableSymbols(names: Collection<Name>): Sequence<KtCallableSymbol> {
if (names.isEmpty()) return emptySequence()
val namesSet = names.toSet()
return getCallableSymbols { it in namesSet }
}
override fun getClassifierSymbols(nameFilter: KtScopeNameFilter): Sequence<KtClassifierSymbol> = withValidityAssertion {
return scope
.getContributedDescriptors(kindFilter = DescriptorKindFilter.CLASSIFIERS, nameFilter)
@@ -42,6 +48,12 @@ internal abstract class KtFe10ScopeResolution : KtScope, KtLifetimeOwner {
.mapNotNull { it.toKtSymbol(analysisContext) as? KtClassifierSymbol }
}
override fun getClassifierSymbols(names: Collection<Name>): Sequence<KtClassifierSymbol> {
if (names.isEmpty()) return emptySequence()
val namesSet = names.toSet()
return getClassifierSymbols { it in namesSet }
}
override fun getPackageSymbols(nameFilter: KtScopeNameFilter): Sequence<KtPackageSymbol> = withValidityAssertion {
emptySequence()
}