diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableClinitClassBuilderInterceptorExtension.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableClinitClassBuilderInterceptorExtension.kt index eee9aa3ca6e..eaf586b71a0 100644 --- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableClinitClassBuilderInterceptorExtension.kt +++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableClinitClassBuilderInterceptorExtension.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.codegen.ClassBuilderFactory import org.jetbrains.kotlin.codegen.DelegatingClassBuilder import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension import org.jetbrains.kotlin.diagnostics.DiagnosticSink -import org.jetbrains.kotlin.psi.KtClass +import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin import org.jetbrains.org.objectweb.asm.* @@ -68,7 +68,7 @@ class ParcelableClinitClassBuilderInterceptorExtension : ClassBuilderInterceptor internal val delegateClassBuilder: ClassBuilder, val bindingContext: BindingContext ) : DelegatingClassBuilder() { - private var currentClass: KtClass? = null + private var currentClass: KtClassOrObject? = null private var currentClassName: String? = null private var isClinitGenerated = false @@ -83,7 +83,7 @@ class ParcelableClinitClassBuilderInterceptorExtension : ClassBuilderInterceptor superName: String, interfaces: Array ) { - if (origin is KtClass) { + if (origin is KtClassOrObject) { currentClass = origin } else { currentClass = null diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableCodegenExtension.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableCodegenExtension.kt index 680aaaeba76..a1427df1349 100644 --- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableCodegenExtension.kt +++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableCodegenExtension.kt @@ -60,6 +60,8 @@ open class ParcelableCodegenExtension : ExpressionCodegenExtension { private companion object { private val FILE_DESCRIPTOR_FQNAME = FqName(FileDescriptor::class.java.canonicalName) private val CREATOR_NAME = Name.identifier("CREATOR") + + private val ALLOWED_CLASS_KINDS = listOf(ClassKind.CLASS, ClassKind.OBJECT, ClassKind.ENUM_CLASS) } protected open fun isExperimental(element: KtElement) = true @@ -74,7 +76,7 @@ open class ParcelableCodegenExtension : ExpressionCodegenExtension { val sourceElement = (codegen.myClass as? KtClassOrObject) ?: return if (!isExperimental(sourceElement)) return - if (parcelableClass.kind != ClassKind.CLASS && parcelableClass.kind != ClassKind.OBJECT) return + if (parcelableClass.kind !in ALLOWED_CLASS_KINDS) return val propertiesToSerialize = getPropertiesToSerialize(codegen, parcelableClass) @@ -163,15 +165,25 @@ open class ParcelableCodegenExtension : ExpressionCodegenExtension { val globalContext = ParcelSerializer.ParcelSerializerContext(codegen.typeMapper, containerAsmType, emptyList(), frameMap) - for ((fieldName, type, parcelers) in properties) { - val asmType = codegen.typeMapper.mapType(type) - + if (properties.isEmpty()) { + val entityType = this@writeWriteToParcel.defaultType + val asmType = codegen.state.typeMapper.mapType(entityType) + val serializer = ParcelSerializer.get(entityType, asmType, globalContext, strict = true) v.load(1, parcelAsmType) v.load(0, containerAsmType) - v.getfield(containerAsmType.internalName, fieldName, asmType.descriptor) - - val serializer = ParcelSerializer.get(type, asmType, globalContext.copy(typeParcelers = parcelers)) serializer.writeValue(v) + } else { + for ((fieldName, type, parcelers) in properties) { + val asmType = codegen.typeMapper.mapType(type) + + v.load(1, parcelAsmType) + v.load(0, containerAsmType) + v.getfield(containerAsmType.internalName, fieldName, asmType.descriptor) + + val serializer = ParcelSerializer.get(type, asmType, globalContext.copy(typeParcelers = parcelers)) + serializer.writeValue(v) + } + } } @@ -253,16 +265,24 @@ open class ParcelableCodegenExtension : ExpressionCodegenExtension { val globalContext = ParcelSerializer.ParcelSerializerContext(codegen.typeMapper, containerAsmType, emptyList(), frameMap) - for ((_, type, parcelers) in properties) { - val asmType = codegen.typeMapper.mapType(type) - asmConstructorParameters.append(asmType.descriptor) - - val serializer = ParcelSerializer.get(type, asmType, globalContext.copy(typeParcelers = parcelers)) + if (properties.isEmpty()) { + val entityType = parcelableClass.defaultType + val asmType = codegen.state.typeMapper.mapType(entityType) + val serializer = ParcelSerializer.get(entityType, asmType, globalContext, strict = true) v.load(1, parcelAsmType) serializer.readValue(v) - } + } else { + for ((_, type, parcelers) in properties) { + val asmType = codegen.typeMapper.mapType(type) + asmConstructorParameters.append(asmType.descriptor) - v.invokespecial(containerAsmType.internalName, "", "($asmConstructorParameters)V", false) + val serializer = ParcelSerializer.get(type, asmType, globalContext.copy(typeParcelers = parcelers)) + v.load(1, parcelAsmType) + serializer.readValue(v) + } + + v.invokespecial(containerAsmType.internalName, "", "($asmConstructorParameters)V", false) + } } v.areturn(containerAsmType) diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt index 3c0d61ac798..4104c81edc7 100644 --- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt +++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt @@ -109,14 +109,13 @@ class ParcelableDeclarationChecker : DeclarationChecker { ) { if (!descriptor.isParcelize) return - if (declaration !is KtClass || (declaration.isAnnotation() || declaration.isInterface())) { - val reportElement = (declaration as? KtClassOrObject)?.nameIdentifier ?: declaration - diagnosticHolder.reportFromPlugin(ErrorsAndroid.PARCELABLE_SHOULD_BE_CLASS.on(reportElement), DefaultErrorMessagesAndroid) + if (declaration !is KtClassOrObject) { + diagnosticHolder.reportFromPlugin(ErrorsAndroid.PARCELABLE_SHOULD_BE_CLASS.on(declaration), DefaultErrorMessagesAndroid) return } - if (declaration.isEnum()) { - val reportElement = (declaration as? KtClass)?.nameIdentifier ?: declaration + if (declaration is KtClass && (declaration.isAnnotation() || declaration.isInterface())) { + val reportElement = declaration.nameIdentifier ?: declaration diagnosticHolder.reportFromPlugin(ErrorsAndroid.PARCELABLE_SHOULD_BE_CLASS.on(reportElement), DefaultErrorMessagesAndroid) return } @@ -133,7 +132,7 @@ class ParcelableDeclarationChecker : DeclarationChecker { diagnosticHolder.reportFromPlugin(ErrorsAndroid.PARCELABLE_SHOULD_BE_INSTANTIABLE.on(sealedOrAbstract), DefaultErrorMessagesAndroid) } - if (declaration.isInner()) { + if (declaration is KtClass && declaration.isInner()) { val reportElement = declaration.modifierList?.getModifier(KtTokens.INNER_KEYWORD) ?: declaration.nameIdentifier ?: declaration diagnosticHolder.reportFromPlugin(ErrorsAndroid.PARCELABLE_CANT_BE_INNER_CLASS.on(reportElement), DefaultErrorMessagesAndroid) } diff --git a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/serializers/ParcelSerializer.kt b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/serializers/ParcelSerializer.kt index 38ba8701ec0..15311701fec 100644 --- a/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/serializers/ParcelSerializer.kt +++ b/plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/serializers/ParcelSerializer.kt @@ -230,6 +230,12 @@ interface ParcelSerializer { Method("writeRawFileDescriptor"), Method("readRawFileDescriptor"))) + // Write at least a nullability byte. + // We don't want parcel to be empty in case if all constructor parameters are objects + type.isNamedObject() -> NullAwareParcelSerializerWrapper(ObjectParcelSerializer(asmType, type, typeMapper)) + + type.isEnum() -> wrapToNullAwareIfNeeded(type, EnumParcelSerializer(asmType)) + type.isParcelable() -> { val clazz = type.constructor.declarationDescriptor as? ClassDescriptor if (clazz != null && clazz.modality == Modality.FINAL && clazz.source is PsiSourceElement) { @@ -257,12 +263,6 @@ interface ParcelSerializer { } } - // Write at least a nullability byte. - // We don't want parcel to be empty in case if all constructor parameters are objects - type.isNamedObject() -> NullAwareParcelSerializerWrapper(ObjectParcelSerializer(asmType, type, typeMapper)) - - type.isEnum() -> wrapToNullAwareIfNeeded(type, EnumParcelSerializer(asmType)) - type.isSerializable() -> NullCompliantObjectParcelSerializer(asmType, Method("writeSerializable", "(Ljava/io/Serializable;)V"), Method("readSerializable", "()Ljava/io/Serializable;")) diff --git a/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/android/parcel/ParcelBoxTest.kt b/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/android/parcel/ParcelBoxTest.kt index bbcc0a310ec..bbd38765b62 100644 --- a/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/android/parcel/ParcelBoxTest.kt +++ b/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/android/parcel/ParcelBoxTest.kt @@ -54,6 +54,7 @@ class ParcelBoxTest : AbstractParcelBoxTest() { fun testCustomSerializerWriteWith() = doTest("customSerializerWriteWith") fun testCustomSerializerBoxing() = doTest("customSerializerBoxing") fun testKt20717() = doTest("kt20717") + fun testEnumObject() = doTest("enumObject") } class ParcelBoxTestWithSerializableLikeExtension : AbstractParcelBoxTest() { diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/enumObject.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/enumObject.kt new file mode 100644 index 00000000000..f4ede12e7d9 --- /dev/null +++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/enumObject.kt @@ -0,0 +1,37 @@ +// WITH_RUNTIME + +@file:JvmName("TestKt") +package test + +import kotlinx.android.parcel.* +import android.os.Parcel +import android.os.Parcelable + +@Parcelize +enum class Color : Parcelable { BLACK, WHITE } + +@Parcelize +object Obj : Parcelable + +fun box() = parcelTest { parcel -> + val black = Color.BLACK + val obj = Obj + + black.writeToParcel(parcel, 0) + obj.writeToParcel(parcel, 0) + + println(black) + println(obj) + + val bytes = parcel.marshall() + parcel.unmarshall(bytes, 0, bytes.size) + + val black2 = readFromParcel(parcel) + val obj2 = readFromParcel(parcel) + + println(black2) + println(obj2) + + assert(black2 == black) + assert(obj2 != null) +} \ No newline at end of file diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/modality.kt b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/modality.kt index 57222908983..a210cf375c2 100644 --- a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/modality.kt +++ b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/modality.kt @@ -24,7 +24,7 @@ class Outer { fun foo() { @Parcelize - object : Parcelable {} + object : Parcelable {} @Parcelize class Local {} diff --git a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/wrongAnnotationTarget.kt b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/wrongAnnotationTarget.kt index 9ec454cd689..4e2704dae23 100644 --- a/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/wrongAnnotationTarget.kt +++ b/plugins/android-extensions/android-extensions-idea/testData/android/parcel/checker/wrongAnnotationTarget.kt @@ -7,17 +7,17 @@ import android.os.Parcelable interface Intf : Parcelable @Parcelize -object Obj +object Obj class A { @Parcelize - companion object { + companion object { fun foo() {} } } @Parcelize -enum class Enum { +enum class Enum { WHITE, BLACK }