FIR LC: make fields in objects static
This commit is contained in:
committed by
Ilya Kirillov
parent
82c2f0c6fd
commit
7757fd312b
+2
-4
@@ -272,12 +272,10 @@ internal open class FirLightClassForSymbol(
|
|||||||
|
|
||||||
fun addPropertyBackingField(propertySymbol: KtPropertySymbol) {
|
fun addPropertyBackingField(propertySymbol: KtPropertySymbol) {
|
||||||
val isJvmField = propertySymbol.hasJvmFieldAnnotation()
|
val isJvmField = propertySymbol.hasJvmFieldAnnotation()
|
||||||
val isJvmStatic = propertySymbol.hasJvmStaticAnnotation()
|
|
||||||
val isLateInit = (propertySymbol as? KtKotlinPropertySymbol)?.isLateInit == true
|
val isLateInit = (propertySymbol as? KtKotlinPropertySymbol)?.isLateInit == true
|
||||||
|
|
||||||
val forceStatic = classOrObjectSymbol.isObject &&
|
val forceStatic = classOrObjectSymbol.isObject
|
||||||
(propertySymbol is KtKotlinPropertySymbol && propertySymbol.isConst || isJvmStatic || isJvmField)
|
val takePropertyVisibility = !classOrObjectSymbol.isCompanionObject && (isLateInit || isJvmField)
|
||||||
val takePropertyVisibility = !classOrObjectSymbol.isCompanionObject && (isLateInit || isJvmField || forceStatic)
|
|
||||||
|
|
||||||
createField(
|
createField(
|
||||||
declaration = propertySymbol,
|
declaration = propertySymbol,
|
||||||
|
|||||||
Reference in New Issue
Block a user