From b42d2e56a4e272a1f3ed4bc56b2cc5a2c9c2e3d8 Mon Sep 17 00:00:00 2001
From: Jinseong Jeon <jsjeon@google.com>
Date: Sat, 6 May 2023 23:15:38 -0700
Subject: [PATCH] AA: use nameFilter of KtFileScope#get*Symbols

---
 .../analysis/api/descriptors/scopes/KtFe10FileScope.kt   | 4 ++--
 .../kotlin/analysis/api/fir/scopes/KtFirFileScope.kt     | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/scopes/KtFe10FileScope.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/scopes/KtFe10FileScope.kt
index a6ba240c901..718e13b18f0 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/scopes/KtFe10FileScope.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/scopes/KtFe10FileScope.kt
@@ -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)
                 }
             }
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirFileScope.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirFileScope.kt
index 21f14efb79c..1992f380bd4 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirFileScope.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/scopes/KtFirFileScope.kt
@@ -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 {