From d0782cb5a5e97ff8651f7f5133bcb21f1e40c7e7 Mon Sep 17 00:00:00 2001 From: Marco Pennekamp Date: Mon, 6 Mar 2023 22:23:52 +0100 Subject: [PATCH] [AA] KT-56617 Remove `isValidityAssertion` from internal properties of `KtFirPsiJavaClassSymbol` --- .../analysis/api/fir/symbols/KtFirPsiJavaClassSymbol.kt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPsiJavaClassSymbol.kt b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPsiJavaClassSymbol.kt index f2213998efd..e6cf8e327f1 100644 --- a/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPsiJavaClassSymbol.kt +++ b/analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/symbols/KtFirPsiJavaClassSymbol.kt @@ -79,9 +79,7 @@ internal class KtFirPsiJavaClassSymbol( get() = withValidityAssertion { classIdIfNonLocal.outerClassId != null && !javaClass.isStatic } val outerClass: KtFirPsiJavaClassSymbol? - get() = withValidityAssertion { - psi.containingClass?.let { KtFirPsiJavaClassSymbol(it, analysisSession) } - } + get() = psi.containingClass?.let { KtFirPsiJavaClassSymbol(it, analysisSession) } override val typeParameters: List by cached { // The parent Java class might contribute type parameters to the Java type parameter stack, but for this KtSymbol, parent type @@ -99,10 +97,10 @@ internal class KtFirPsiJavaClassSymbol( } val annotationSimpleNames: List - get() = withValidityAssertion { psi.annotations.map { it.nameReferenceElement?.referenceName } } + get() = psi.annotations.map { it.nameReferenceElement?.referenceName } val hasAnnotations: Boolean - get() = withValidityAssertion { psi.annotations.isNotEmpty() } + get() = psi.annotations.isNotEmpty() override val isData: Boolean get() = withValidityAssertion { false } override val isInline: Boolean get() = withValidityAssertion { false }