From 00b893444cb93fb930bd5ce9c51a4cee0dbf6288 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Tue, 28 Jun 2022 16:15:45 +0200
Subject: [PATCH] [Analysis API] remove unneeded analyzeWithSymbolAsContext

---
 .../descriptors/KtFe10CliAnalysisSessionProvider.kt | 13 -------------
 .../impl/base/CachingKtAnalysisSessionProvider.kt   |  7 -------
 .../api/session/KtAnalysisSessionProvider.kt        | 10 ----------
 3 files changed, 30 deletions(-)

diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/KtFe10CliAnalysisSessionProvider.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/KtFe10CliAnalysisSessionProvider.kt
index 949ee1e8316..350043427ff 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/KtFe10CliAnalysisSessionProvider.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/KtFe10CliAnalysisSessionProvider.kt
@@ -24,19 +24,6 @@ class KtFe10AnalysisSessionProvider(project: Project) : KtAnalysisSessionProvide
         return KtFe10AnalysisSession(useSiteKtElement, factory.create(project))
     }
 
-    override fun getAnalysisSessionBySymbol(contextSymbol: KtSymbol): KtAnalysisSession {
-        if (contextSymbol is KtFe10Symbol) {
-            return KtFe10AnalysisSession(contextSymbol.analysisContext, contextSymbol.analysisContext.contextElement.getKtModule())
-        } else {
-            val contextElement = contextSymbol.psi
-            if (contextElement is KtElement) {
-                return KtFe10AnalysisSession(contextElement, contextSymbol.token)
-            }
-        }
-
-        throw UnsupportedOperationException("getAnalysisSessionBySymbol() should not be used on KtFe10AnalysisSession")
-    }
-
     override fun getAnalysisSessionByUseSiteKtModule(useSiteKtModule: KtModule, factory: KtLifetimeTokenFactory): KtAnalysisSession {
         throw UnsupportedOperationException("getAnalysisSessionByModule() should not be used on KtFe10AnalysisSession")
     }
diff --git a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/CachingKtAnalysisSessionProvider.kt b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/CachingKtAnalysisSessionProvider.kt
index 555f0386f7c..aeeb2f6d76f 100644
--- a/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/CachingKtAnalysisSessionProvider.kt
+++ b/analysis/analysis-api-impl-base/src/org/jetbrains/kotlin/analysis/api/impl/base/CachingKtAnalysisSessionProvider.kt
@@ -53,13 +53,6 @@ abstract class CachingKtAnalysisSessionProvider<State : Any>(project: Project) :
         }
     }
 
-    final override fun getAnalysisSessionBySymbol(contextSymbol: KtSymbol): KtAnalysisSession {
-        val firResolveSession = getFirResolveSession(contextSymbol)
-        val token = contextSymbol.token
-        return getCachedAnalysisSession(firResolveSession, token)
-            ?: createAnalysisSession(firResolveSession, contextSymbol.token)
-    }
-
     private fun getCachedAnalysisSession(firResolveSession: State, token: KtLifetimeToken): KtAnalysisSession? {
         return cache.getCachedAnalysisSession(firResolveSession to token::class)
     }
diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/session/KtAnalysisSessionProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/session/KtAnalysisSessionProvider.kt
index 7229a7a2b0d..c4da0f01f51 100644
--- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/session/KtAnalysisSessionProvider.kt
+++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/session/KtAnalysisSessionProvider.kt
@@ -31,18 +31,8 @@ public abstract class KtAnalysisSessionProvider(public val project: Project) : D
 
     public abstract fun getAnalysisSession(useSiteKtElement: KtElement, factory: KtLifetimeTokenFactory): KtAnalysisSession
 
-    public abstract fun getAnalysisSessionBySymbol(contextSymbol: KtSymbol): KtAnalysisSession
-
     public abstract fun getAnalysisSessionByUseSiteKtModule(useSiteKtModule: KtModule, factory: KtLifetimeTokenFactory): KtAnalysisSession
 
-    public inline fun <R> analyzeWithSymbolAsContext(
-        contextSymbol: KtSymbol,
-        action: KtAnalysisSession.() -> R
-    ): R {
-        val analysisSession = getAnalysisSessionBySymbol(contextSymbol)
-        return action(analysisSession)
-    }
-
     public inline fun <R> analyseInDependedAnalysisSession(
         originalFile: KtFile,
         elementToReanalyze: KtElement,