From 20598cf7d7cda890ae9e8b2cdee374f3437004be Mon Sep 17 00:00:00 2001
From: aleksandrina-streltsova <alexandrina.streltsova@jetbrains.com>
Date: Mon, 17 Jul 2023 10:44:42 +0300
Subject: [PATCH] Revert "[Analysis API] Add API for expect/actual declaration
 detection"

This reverts commit 338c2433ac7ec8b6d0842db775cab8b75fef1441.
---
 .../KtFe10MultiplatformInfoProvider.kt        |  7 +-----
 .../KtFirMultiplatformInfoProvider.kt         | 24 ++++++-------------
 .../components/KtMultiplatformInfoProvider.kt |  5 ----
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10MultiplatformInfoProvider.kt b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10MultiplatformInfoProvider.kt
index ff4dd388a22..e914317b739 100644
--- a/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10MultiplatformInfoProvider.kt
+++ b/analysis/analysis-api-fe10/src/org/jetbrains/kotlin/analysis/api/descriptors/components/KtFe10MultiplatformInfoProvider.kt
@@ -16,7 +16,6 @@ import org.jetbrains.kotlin.utils.exceptions.checkWithAttachment
 import org.jetbrains.kotlin.descriptors.MemberDescriptor
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier
-import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier
 import org.jetbrains.kotlin.resolve.multiplatform.ExpectActualCompatibility
 import org.jetbrains.kotlin.resolve.multiplatform.ExpectedActualResolver
 
@@ -24,7 +23,7 @@ internal class KtFe10MultiplatformInfoProvider(
     override val analysisSession: KtFe10AnalysisSession
 ) : KtMultiplatformInfoProvider(), Fe10KtAnalysisSessionComponent {
     override fun getExpectForActual(actual: KtDeclarationSymbol): KtDeclarationSymbol? {
-        if (!isActual(actual)) return null
+        if (actual.psiSafe<KtDeclaration>()?.hasActualModifier() != true) return null
         val memberDescriptor = (getSymbolDescriptor(actual) as? MemberDescriptor)?.takeIf { it.isActual } ?: return null
 
         val expectedCompatibilityMap =
@@ -42,8 +41,4 @@ internal class KtFe10MultiplatformInfoProvider(
         }
         return expectsForActual.singleOrNull()?.toKtSymbol(analysisContext) as? KtDeclarationSymbol
     }
-
-    override fun isActual(symbol: KtDeclarationSymbol): Boolean = symbol.psiSafe<KtDeclaration>()?.hasActualModifier() == true
-
-    override fun isExpect(symbol: KtDeclarationSymbol): Boolean = symbol.psiSafe<KtDeclaration>()?.hasExpectModifier() == true
 }
\ No newline at end of file
diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirMultiplatformInfoProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirMultiplatformInfoProvider.kt
index 4d28fae1f02..d18c1c60ae8 100644
--- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirMultiplatformInfoProvider.kt
+++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirMultiplatformInfoProvider.kt
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken
 import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol
 import org.jetbrains.kotlin.fir.utils.exceptions.withFirSymbolEntry
 import org.jetbrains.kotlin.utils.exceptions.checkWithAttachment
-import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus
 import org.jetbrains.kotlin.fir.declarations.expectForActual
 import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
@@ -26,7 +25,13 @@ internal class KtFirMultiplatformInfoProvider(
     override fun getExpectForActual(actual: KtDeclarationSymbol): KtDeclarationSymbol? {
         require(actual is KtFirSymbol<*>)
         val firSymbol = actual.firSymbol
-        if (!isActual(actual)) return null
+        val status = when (firSymbol) {
+            is FirCallableSymbol -> firSymbol.rawStatus
+            is FirClassSymbol -> firSymbol.rawStatus
+            is FirTypeAliasSymbol -> firSymbol.rawStatus
+            else -> null
+        }
+        if (status?.isActual != true) return null
 
         val expectsForActual = firSymbol.expectForActual?.get(ExpectActualCompatibility.Compatible) ?: return null
         checkWithAttachment(expectsForActual.size <= 1, message = { "expected as maximum one `expect` for the actual" }) {
@@ -38,19 +43,4 @@ internal class KtFirMultiplatformInfoProvider(
         }
         return expectsForActual.singleOrNull()?.let { analysisSession.firSymbolBuilder.buildSymbol(it) as? KtDeclarationSymbol }
     }
-
-    override fun isActual(symbol: KtDeclarationSymbol): Boolean = getStatus(symbol)?.isActual == true
-
-    override fun isExpect(symbol: KtDeclarationSymbol): Boolean = getStatus(symbol)?.isExpect == true
-
-    private fun getStatus(symbol: KtDeclarationSymbol): FirDeclarationStatus? {
-        require(symbol is KtFirSymbol<*>)
-        val firSymbol = symbol.firSymbol
-        return when (firSymbol) {
-            is FirCallableSymbol -> firSymbol.rawStatus
-            is FirClassSymbol -> firSymbol.rawStatus
-            is FirTypeAliasSymbol -> firSymbol.rawStatus
-            else -> null
-        }
-    }
 }
\ No newline at end of file
diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtMultiplatformInfoProvider.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtMultiplatformInfoProvider.kt
index fe1a7799d6d..65df5843e06 100644
--- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtMultiplatformInfoProvider.kt
+++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/components/KtMultiplatformInfoProvider.kt
@@ -10,8 +10,6 @@ import org.jetbrains.kotlin.analysis.api.symbols.KtDeclarationSymbol
 
 public abstract class KtMultiplatformInfoProvider : KtAnalysisSessionComponent() {
     public abstract fun getExpectForActual(actual: KtDeclarationSymbol): KtDeclarationSymbol?
-    public abstract fun isActual(symbol: KtDeclarationSymbol): Boolean
-    public abstract fun isExpect(symbol: KtDeclarationSymbol): Boolean
 }
 
 public interface KtMultiplatformInfoProviderMixin : KtAnalysisSessionMixIn {
@@ -22,7 +20,4 @@ public interface KtMultiplatformInfoProviderMixin : KtAnalysisSessionMixIn {
     public fun KtDeclarationSymbol.getExpectForActual(): KtDeclarationSymbol? =
         withValidityAssertion { analysisSession.multiplatformInfoProvider.getExpectForActual(this) }
 
-    public fun KtDeclarationSymbol.isActual(): Boolean = withValidityAssertion { analysisSession.multiplatformInfoProvider.isActual(this) }
-
-    public fun KtDeclarationSymbol.isExpect(): Boolean = withValidityAssertion { analysisSession.multiplatformInfoProvider.isExpect(this) }
 }
\ No newline at end of file