Raw FIR: don't check class kind for data / inline modifiers

This commit is contained in:
Mikhail Glukhikh
2020-04-30 13:00:59 +03:00
parent 9a561f4a7c
commit 3d60fdfed1
2 changed files with 4 additions and 4 deletions
@@ -378,8 +378,8 @@ class DeclarationsConverter(
isActual = modifiers.hasActual()
isInner = modifiers.isInner()
isCompanion = modifiers.isCompanion() && classKind == ClassKind.OBJECT
isData = modifiers.isDataClass() && classKind != ClassKind.OBJECT
isInline = modifiers.isInlineClass() && classKind != ClassKind.OBJECT
isData = modifiers.isDataClass()
isInline = modifiers.isInlineClass()
}
val classBuilder = if (status.modality == Modality.SEALED) {
@@ -659,8 +659,8 @@ class RawFirBuilder(
isActual = classOrObject.hasActualModifier()
isInner = classOrObject.hasModifier(INNER_KEYWORD)
isCompanion = (classOrObject as? KtObjectDeclaration)?.isCompanion() == true
isData = (classOrObject as? KtClass)?.isData() == true
isInline = (classOrObject as? KtClass)?.hasModifier(INLINE_KEYWORD) == true
isData = classOrObject.hasModifier(DATA_KEYWORD)
isInline = classOrObject.hasModifier(INLINE_KEYWORD)
}
withCapturedTypeParameters {
if (!status.isInner) context.capturedTypeParameters = context.capturedTypeParameters.clear()