From a4dbf0ae5765b900a4b9286576bcdc55df2b636d Mon Sep 17 00:00:00 2001 From: Igor Yakovlev Date: Tue, 1 Jun 2021 18:30:44 +0200 Subject: [PATCH] [FIR IDE] Update class modifiers requirements for resolve phase --- .../api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt index 101215b06d6..f610978f6c3 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/KtFirNamedClassOrObjectSymbol.kt @@ -55,12 +55,11 @@ internal class KtFirNamedClassOrObjectSymbol( override fun containsAnnotation(classId: ClassId): Boolean = firRef.containsAnnotation(classId) override val annotationClassIds: Collection by cached { firRef.getAnnotationClassIds() } - override val isInner: Boolean get() = firRef.withFir(FirResolvePhase.STATUS) { it.isInner } - override val isData: Boolean get() = firRef.withFir(FirResolvePhase.STATUS) { it.isData } - override val isInline: Boolean get() = firRef.withFir(FirResolvePhase.STATUS) { it.isInline } - override val isFun: Boolean get() = firRef.withFir(FirResolvePhase.STATUS) { it.isFun } - - override val isExternal: Boolean get() = firRef.withFir(FirResolvePhase.STATUS) { it.isExternal } + override val isInner: Boolean get() = firRef.withFir { it.isInner } + override val isData: Boolean get() = firRef.withFir { it.isData } + override val isInline: Boolean get() = firRef.withFir { it.isInline } + override val isFun: Boolean get() = firRef.withFir { it.isFun } + override val isExternal: Boolean get() = firRef.withFir{ it.isExternal } override val companionObject: KtFirNamedClassOrObjectSymbol? by firRef.withFirAndCache { fir -> fir.companionObject?.let { builder.classifierBuilder.buildNamedClassOrObjectSymbol(it) }