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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt
+2 -2
View File
@@ -378,8 +378,8 @@ class DeclarationsConverter(
isActual = modifiers.hasActual() isActual = modifiers.hasActual()
isInner = modifiers.isInner() isInner = modifiers.isInner()
isCompanion = modifiers.isCompanion() && classKind == ClassKind.OBJECT isCompanion = modifiers.isCompanion() && classKind == ClassKind.OBJECT
isData = modifiers.isDataClass() && classKind != ClassKind.OBJECT isData = modifiers.isDataClass()
isInline = modifiers.isInlineClass() && classKind != ClassKind.OBJECT isInline = modifiers.isInlineClass()
} }
val classBuilder = if (status.modality == Modality.SEALED) { val classBuilder = if (status.modality == Modality.SEALED) {
compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+2 -2
View File
@@ -659,8 +659,8 @@ class RawFirBuilder(
isActual = classOrObject.hasActualModifier() isActual = classOrObject.hasActualModifier()
isInner = classOrObject.hasModifier(INNER_KEYWORD) isInner = classOrObject.hasModifier(INNER_KEYWORD)
isCompanion = (classOrObject as? KtObjectDeclaration)?.isCompanion() == true isCompanion = (classOrObject as? KtObjectDeclaration)?.isCompanion() == true
isData = (classOrObject as? KtClass)?.isData() == true isData = classOrObject.hasModifier(DATA_KEYWORD)
isInline = (classOrObject as? KtClass)?.hasModifier(INLINE_KEYWORD) == true isInline = classOrObject.hasModifier(INLINE_KEYWORD)
} }
withCapturedTypeParameters { withCapturedTypeParameters {
if (!status.isInner) context.capturedTypeParameters = context.capturedTypeParameters.clear() if (!status.isInner) context.capturedTypeParameters = context.capturedTypeParameters.clear()