[AA LC] Fix visibility of fields from companion objects

^KTIJ-22541
This commit is contained in:
Dmitriy Novozhilov
2022-07-28 11:32:07 +03:00
parent c34f952126
commit 1ff51356b9
4 changed files with 18 additions and 35 deletions
@@ -135,7 +135,7 @@ internal abstract class SymbolLightClassForClassOrObject(
getDeclaredMemberScope().getCallableSymbols()
.filterIsInstance<KtPropertySymbol>()
.applyIf(isInterface) {
filter { it.hasJvmFieldAnnotation() || it.isConst }
filter { it.isConstOrJvmField }
}
.mapTo(result) {
SymbolLightFieldForProperty(
@@ -145,12 +145,15 @@ internal abstract class SymbolLightClassForClassOrObject(
lightMemberOrigin = null,
isTopLevel = false,
forceStatic = true,
takePropertyVisibility = true
takePropertyVisibility = it.isConstOrJvmField
)
}
}
}
private val KtPropertySymbol.isConstOrJvmField: Boolean
get() = isConst || hasJvmFieldAnnotation()
private val KtPropertySymbol.isConst: Boolean
get() = (this as? KtKotlinPropertySymbol)?.isConst == true