azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SLC] SymbolLightFieldForProperty: move STATIC modifier calculation to initial values

Browse Source 
^KT-57569
This commit is contained in:
Dmitrii Gridin
2023-03-31 11:47:49 +02:00
committed by teamcity
parent 98074c4849
commit 691a1a683f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/SymbolLightFieldForProperty.kt
+5 -5
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.light.classes.symbol.fields package org.jetbrains.kotlin.light.classes.symbol.fields
import com.intellij.psi.* import com.intellij.psi.*
import kotlinx.collections.immutable.persistentHashMapOf
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.api.KtConstantInitializerValue import org.jetbrains.kotlin.analysis.api.KtConstantInitializerValue
import org.jetbrains.kotlin.analysis.api.annotations.* import org.jetbrains.kotlin.analysis.api.annotations.*
@@ -116,10 +117,6 @@ internal class SymbolLightFieldForProperty private constructor(
GranularModifiersBox.MODALITY_MODIFIERS_MAP.with(modality) GranularModifiersBox.MODALITY_MODIFIERS_MAP.with(modality)
} }
PsiModifier.STATIC -> {
mapOf(modifier to isStatic)
}
PsiModifier.VOLATILE -> withPropertySymbol { propertySymbol -> PsiModifier.VOLATILE -> withPropertySymbol { propertySymbol ->
val hasAnnotation = propertySymbol.hasAnnotation( val hasAnnotation = propertySymbol.hasAnnotation(
VOLATILE_ANNOTATION_CLASS_ID, VOLATILE_ANNOTATION_CLASS_ID,
@@ -144,7 +141,10 @@ internal class SymbolLightFieldForProperty private constructor(
private val _modifierList: PsiModifierList by lazyPub { private val _modifierList: PsiModifierList by lazyPub {
SymbolLightMemberModifierList( SymbolLightMemberModifierList(
containingDeclaration = this, containingDeclaration = this,
modifiersBox = GranularModifiersBox(computer = ::computeModifiers), modifiersBox = GranularModifiersBox(
initialValue = persistentHashMapOf(PsiModifier.STATIC to isStatic),
computer = ::computeModifiers,
),
annotationsBox = GranularAnnotationsBox( annotationsBox = GranularAnnotationsBox(
annotationsProvider = SymbolAnnotationsProvider( annotationsProvider = SymbolAnnotationsProvider(
ktModule = ktModule, ktModule = ktModule,