From 3bc19fa2c7a5af1fcba39f984e2bb6a1ff62b414 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Thu, 20 Oct 2022 22:15:08 +0200
Subject: [PATCH] [Analysis API] change return type of KtScope.getAllSymbols to
 KtDeclaration symbol as it always returns callable or classifier

---
 .../kotlin/analysis/api/impl/base/scopes/KtCompositeScope.kt  | 2 +-
 .../kotlin/analysis/api/impl/base/scopes/KtEmptyScope.kt      | 2 +-
 .../api/impl/base/test/cases/symbols/AbstractSymbolTest.kt    | 2 +-
 .../src/org/jetbrains/kotlin/analysis/api/scopes/KtScope.kt   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/scopes/KtCompositeScope.kt b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/scopes/KtCompositeScope.kt
index a90f5de2ef6..f3b33d21ffd 100644
--- a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/scopes/KtCompositeScope.kt
+++ b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/scopes/KtCompositeScope.kt
@@ -34,7 +34,7 @@ class KtCompositeScope(
         }
     }
 
-    override fun getAllSymbols(): Sequence<KtSymbol> = withValidityAssertion {
+    override fun getAllSymbols(): Sequence<KtDeclarationSymbol> = withValidityAssertion {
         sequence {
             subScopes.forEach { yieldAll(it.getAllSymbols()) }
         }
diff --git a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/scopes/KtEmptyScope.kt b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/scopes/KtEmptyScope.kt
index d50e11be126..f11493bc388 100644
--- a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/scopes/KtEmptyScope.kt
+++ b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/scopes/KtEmptyScope.kt
@@ -25,7 +25,7 @@ class KtEmptyScope(override val token: KtLifetimeToken) : KtScope {
         return emptySet()
     }
 
-    override fun getAllSymbols(): Sequence<KtSymbol> = withValidityAssertion {
+    override fun getAllSymbols(): Sequence<KtDeclarationSymbol> = withValidityAssertion {
         return emptySequence()
     }
 
diff --git a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt
index addb7b5e76b..e67e40e1831 100644
--- a/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt
+++ b/analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/symbols/AbstractSymbolTest.kt
@@ -75,7 +75,7 @@ abstract class AbstractSymbolTest : AbstractAnalysisApiSingleFileTest() {
                             is KtDeclarationSymbol -> symbol.render(prettyRenderOptions)
                             is KtFileSymbol -> prettyPrint {
                                 printCollection(symbol.getFileScope().getAllSymbols().asIterable(), separator = "\n\n") {
-                                    append((it as KtDeclarationSymbol).render(prettyRenderOptions))
+                                    append(it.render(prettyRenderOptions))
                                 }
                             }
 
diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/scopes/KtScope.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/scopes/KtScope.kt
index 51cbc070e76..20457d35faf 100644
--- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/scopes/KtScope.kt
+++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/scopes/KtScope.kt
@@ -13,9 +13,9 @@ import org.jetbrains.kotlin.name.Name
 
 public interface KtScope : KtScopeLike {
     /**
-     * Return a sequence of all [KtSymbol] which current scope contain
+     * Return a sequence of all [KtDeclarationSymbol] which current scope contain
      */
-    public fun getAllSymbols(): Sequence<KtSymbol> = withValidityAssertion {
+    public fun getAllSymbols(): Sequence<KtDeclarationSymbol> = withValidityAssertion {
         sequence {
             yieldAll(getCallableSymbols())
             yieldAll(getClassifierSymbols())