Fix UL classes tests

Fixed #KT-36717
This commit is contained in:
Igor Yakovlev
2020-02-19 18:59:19 +03:00
parent f47e602118
commit 4693d595b7
7 changed files with 4 additions and 104 deletions
@@ -184,7 +184,7 @@ open class KtUltraLightClass(classOrObject: KtClassOrObject, internal val suppor
membersBuilder.generateUniqueFieldName(companion.name.orEmpty(), usedNames),
this,
support,
setOf(PsiModifier.STATIC, PsiModifier.FINAL, PsiModifier.PUBLIC)
setOf(PsiModifier.STATIC, PsiModifier.FINAL, companion.simpleVisibility())
)
)
@@ -148,6 +148,7 @@ internal open class KtUltraLightFieldImpl protected constructor(
private val _constantInitializer by lazyPub {
if (declaration !is KtProperty) return@lazyPub null
if (!declaration.hasModifier(KtTokens.CONST_KEYWORD)) return@lazyPub null
if (!declaration.hasInitializer()) return@lazyPub null
if (!hasModifierProperty(PsiModifier.FINAL)) return@lazyPub null
if (!TypeConversionUtil.isPrimitiveAndNotNull(_type) && !_type.equalsToText(CommonClassNames.JAVA_LANG_STRING)) return@lazyPub null