From f7bd79a151c950e95b01c49b78f582bdc21e5aae Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Mon, 17 Oct 2022 12:41:08 +0200 Subject: [PATCH] [AA K2] KtFirSymbolInfoProvider: add restriction on fir under fir symbol ^KT-54311 ^KT-54360 --- .../api/fir/components/KtFirSymbolInfoProvider.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolInfoProvider.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolInfoProvider.kt index ce499302143..096031d2894 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolInfoProvider.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirSymbolInfoProvider.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.analysis.api.fir.symbols.KtFirSyntheticJavaPropertyS import org.jetbrains.kotlin.analysis.api.symbols.KtPropertySymbol import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol import org.jetbrains.kotlin.analysis.api.lifetime.KtLifetimeToken +import org.jetbrains.kotlin.analysis.utils.errors.requireIsInstance import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.declarations.getDeprecationForCallSite @@ -73,7 +74,9 @@ internal class KtFirSymbolInfoProvider( return symbol.javaGetterSymbol.name } - val firProperty = symbol.firSymbol.fir as? FirProperty ?: return symbol.name + val firProperty = symbol.firSymbol.fir + requireIsInstance(firProperty) + return getJvmName(firProperty, isSetter = false) } @@ -83,7 +86,9 @@ internal class KtFirSymbolInfoProvider( return symbol.javaSetterSymbol?.name } - val firProperty = symbol.firSymbol.fir as? FirProperty ?: return symbol.name + val firProperty = symbol.firSymbol.fir + requireIsInstance(firProperty) + if (firProperty.isVal) return null return getJvmName(firProperty, isSetter = true)