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

AA: use nameFilter of KtFileScope#get*Symbols

Browse Source
This commit is contained in:
Jinseong Jeon
2023-05-06 23:15:38 -07:00
committed by Ilya Kirillov
parent f87fdb43fa
commit b42d2e56a4
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/scopes/KtFe10FileScope.kt
+2 -2
View File
@@ -44,7 +44,7 @@ internal class KtFe10FileScope(
for (declaration in ktFile.declarations) {
if (declaration is KtCallableDeclaration) {
val descriptor = context[BindingContext.DECLARATION_TO_DESCRIPTOR, declaration] as? CallableDescriptor ?: continue
val ktSymbol = descriptor.toKtCallableSymbol(analysisContext) ?: continue
val ktSymbol = descriptor.takeIf { nameFilter(it.name) }?.toKtCallableSymbol(analysisContext) ?: continue
yield(ktSymbol)
}
}
@@ -58,7 +58,7 @@ internal class KtFe10FileScope(
for (declaration in ktFile.declarations) {
if (declaration is KtClassLikeDeclaration) {
val descriptor = context[BindingContext.DECLARATION_TO_DESCRIPTOR, declaration] as? ClassifierDescriptor ?: continue
val ktSymbol = descriptor.toKtClassifierSymbol(analysisContext) ?: continue
val ktSymbol = descriptor.takeIf { nameFilter(it.name) }?.toKtClassifierSymbol(analysisContext) ?: continue
yield(ktSymbol)
}
}
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirFileScope.kt
+4 -5
View File
@@ -82,10 +82,10 @@ internal class KtFirFileScope(
sequence {
owner.firSymbol.fir.declarations.forEach { firDeclaration ->
val classLikeDeclaration = when (firDeclaration) {
is FirTypeAlias -> if (nameFilter(firDeclaration.name)) firDeclaration else null
is FirRegularClass -> if (nameFilter(firDeclaration.name)) firDeclaration else null
else -> null
}
is FirTypeAlias -> firDeclaration.takeIf { nameFilter(it.name) }
is FirRegularClass -> firDeclaration.takeIf { nameFilter(it.name) }
else -> null
}
if (classLikeDeclaration != null) {
yield(builder.classifierBuilder.buildClassLikeSymbol(classLikeDeclaration.symbol))
}
@@ -93,7 +93,6 @@ internal class KtFirFileScope(
}
}
override fun getConstructors(): Sequence<KtConstructorSymbol> = withValidityAssertion { emptySequence() }
override fun getPackageSymbols(nameFilter: KtScopeNameFilter): Sequence<KtPackageSymbol> = withValidityAssertion {