From 691a1a683f7737583cbe6b04733a98f911dddaed Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Fri, 31 Mar 2023 11:47:49 +0200 Subject: [PATCH] [SLC] SymbolLightFieldForProperty: move STATIC modifier calculation to initial values ^KT-57569 --- .../symbol/fields/SymbolLightFieldForProperty.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForProperty.kt b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForProperty.kt index 777379c7a4a..0b6eb371708 100644 --- a/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForProperty.kt +++ b/analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForProperty.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.light.classes.symbol.fields import com.intellij.psi.* +import kotlinx.collections.immutable.persistentHashMapOf import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtConstantInitializerValue import org.jetbrains.kotlin.analysis.api.annotations.* @@ -116,10 +117,6 @@ internal class SymbolLightFieldForProperty private constructor( GranularModifiersBox.MODALITY_MODIFIERS_MAP.with(modality) } - PsiModifier.STATIC -> { - mapOf(modifier to isStatic) - } - PsiModifier.VOLATILE -> withPropertySymbol { propertySymbol -> val hasAnnotation = propertySymbol.hasAnnotation( VOLATILE_ANNOTATION_CLASS_ID, @@ -144,7 +141,10 @@ internal class SymbolLightFieldForProperty private constructor( private val _modifierList: PsiModifierList by lazyPub { SymbolLightMemberModifierList( containingDeclaration = this, - modifiersBox = GranularModifiersBox(computer = ::computeModifiers), + modifiersBox = GranularModifiersBox( + initialValue = persistentHashMapOf(PsiModifier.STATIC to isStatic), + computer = ::computeModifiers, + ), annotationsBox = GranularAnnotationsBox( annotationsProvider = SymbolAnnotationsProvider( ktModule = ktModule,