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

Refine visibility computation for lateinit's field in KtUltraLightClass

Browse Source
This commit is contained in:
Denis Zharkov
2018-11-01 14:46:05 +03:00
parent 99afc40d93
commit 8999a21764
3 changed files with 52 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightPsi.kt
+5 -2
View File
@@ -199,8 +199,11 @@ class KtUltraLightClass(classOrObject: KtClassOrObject, private val support: Ult
val visibility = when {
property.hasModifier(PRIVATE_KEYWORD) -> PsiModifier.PRIVATE
property.hasModifier(PROTECTED_KEYWORD) && property.hasModifier(LATEINIT_KEYWORD) -> PsiModifier.PROTECTED
property.hasModifier(CONST_KEYWORD) || (property.hasModifier(LATEINIT_KEYWORD) && property.setter == null) -> PsiModifier.PUBLIC
property.hasModifier(LATEINIT_KEYWORD) -> {
val declaration = property.setter ?: property
simpleVisibility(declaration)
}
property.hasModifier(CONST_KEYWORD) -> PsiModifier.PUBLIC
else -> PsiModifier.PRIVATE
}
val modifiers = hashSetOf(visibility)