From 36d5ffd4eb646497f447495f3737cdf174eb3d1d Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Sat, 27 Jan 2024 15:56:27 +0900 Subject: [PATCH] Revert "AA FIR: have KtFirReceiverParameterSymbol implement KtFirSymbol" The commit is reverted due to failing tests: - FirGotoTypeDeclarationTestGenerated - FirGotoDeclarationTestGenerated This reverts commit eb23984182c4b211107e3d9d1fccf611f0b3c46d. --- .../symbols/KtFirReceiverParameterSymbol.kt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirReceiverParameterSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirReceiverParameterSymbol.kt index a291bc3a173..b370922fa95 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirReceiverParameterSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirReceiverParameterSymbol.kt @@ -27,9 +27,10 @@ import org.jetbrains.kotlin.utils.exceptions.errorWithAttachment import org.jetbrains.kotlin.utils.exceptions.requireWithAttachment internal class KtFirReceiverParameterSymbol( - override val firSymbol: FirCallableSymbol<*>, - override val analysisSession: KtFirAnalysisSession, -) : KtReceiverParameterSymbol(), KtFirSymbol> { + val firSymbol: FirCallableSymbol<*>, + val analysisSession: KtFirAnalysisSession, +) : KtReceiverParameterSymbol(), KtLifetimeOwner { + override val token: KtLifetimeToken get() = analysisSession.token override val psi: PsiElement? = withValidityAssertion{ firSymbol.fir.receiverParameter?.typeRef?.psi } init { @@ -39,13 +40,15 @@ internal class KtFirReceiverParameterSymbol( } override val type: KtType by cached { - firSymbol.receiverType(builder) + firSymbol.receiverType(analysisSession.firSymbolBuilder) ?: errorWithAttachment("${firSymbol::class} doesn't have an extension receiver") { withFirEntry("callable", firSymbol.fir) } } - override val owningCallableSymbol: KtCallableSymbol by cached { builder.callableBuilder.buildCallableSymbol(firSymbol) } + override val owningCallableSymbol: KtCallableSymbol by cached { analysisSession.firSymbolBuilder.callableBuilder.buildCallableSymbol(firSymbol) } + + override val origin: KtSymbolOrigin = withValidityAssertion { firSymbol.fir.ktSymbolOrigin() } context(KtAnalysisSession) override fun createPointer(): KtSymbolPointer = withValidityAssertion { @@ -53,9 +56,6 @@ internal class KtFirReceiverParameterSymbol( } override val annotationsList: KtAnnotationsList by cached { - KtFirAnnotationListForReceiverParameter.create(firSymbol, builder) + KtFirAnnotationListForReceiverParameter.create(firSymbol, builder = analysisSession.firSymbolBuilder) } - - override fun equals(other: Any?): Boolean = symbolEquals(other) - override fun hashCode(): Int = symbolHashCode() }