Parcelable, minor: Rename MagicParcel to Parcelize

plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableClinitClassBuilderInterceptorExtension.kt

@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.android.synthetic.codegen
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.android.parcel.isMagicParcelable
+import org.jetbrains.kotlin.android.parcel.isParcelize
 import org.jetbrains.kotlin.codegen.ClassBuilder
 import org.jetbrains.kotlin.codegen.ClassBuilderFactory
 import org.jetbrains.kotlin.codegen.DelegatingClassBuilder
@@ -97,7 +97,7 @@ class ParcelableClinitClassBuilderInterceptorExtension : ClassBuilderInterceptor
         override fun done() {
             if (!isClinitGenerated && currentClass != null && currentClassName != null) {
                 val descriptor = bindingContext[BindingContext.CLASS, currentClass]
-                if (descriptor != null && descriptor.isMagicParcelable) {
+                if (descriptor != null && descriptor.isParcelize) {
                     val baseVisitor = super.newMethod(JvmDeclarationOrigin.NO_ORIGIN, ACC_STATIC, "<clinit>", "()V", null, null)
                     val visitor = ClinitAwareMethodVisitor(currentClassName!!, baseVisitor)
 
@@ -122,7 +122,7 @@ class ParcelableClinitClassBuilderInterceptorExtension : ClassBuilderInterceptor
                 isClinitGenerated = true
 
                 val descriptor = bindingContext[BindingContext.CLASS, currentClass]
-                if (descriptor != null && descriptor.isMagicParcelable) {
+                if (descriptor != null && descriptor.isParcelize) {
                     return ClinitAwareMethodVisitor(
                             currentClassName!!,
                             super.newMethod(origin, access, name, desc, signature, exceptions))

plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableCodegenExtension.kt

@@ -64,7 +64,7 @@ open class ParcelableCodegenExtension : ExpressionCodegenExtension {
 
     override fun generateClassSyntheticParts(codegen: ImplementationBodyCodegen) {
         val parcelableClass = codegen.descriptor
-        if (!parcelableClass.isMagicParcelable) return
+        if (!parcelableClass.isParcelize) return
 
         val sourceElement = (codegen.myClass as? KtClassOrObject) ?: return
         if (!isExperimental(sourceElement)) return

plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableDeclarationChecker.kt

@@ -78,7 +78,7 @@ class ParcelableDeclarationChecker : SimpleDeclarationChecker {
             declaration: KtFunction,
             diagnosticHolder: DiagnosticSink
     ) {
-        if (!containingClass.isMagicParcelable) return
+        if (!containingClass.isParcelize) return
 
         if (method.isWriteToParcel() && declaration.hasModifier(KtTokens.OVERRIDE_KEYWORD)) {
             val reportElement = declaration.modifierList?.getModifier(KtTokens.OVERRIDE_KEYWORD) ?: declaration.nameIdentifier ?: declaration
@@ -93,7 +93,7 @@ class ParcelableDeclarationChecker : SimpleDeclarationChecker {
             diagnosticHolder: DiagnosticSink,
             bindingContext: BindingContext
     ) {
-        if (containingClass.isMagicParcelable
+        if (containingClass.isParcelize
                 && (declaration.hasDelegate() || bindingContext[BindingContext.BACKING_FIELD_REQUIRED, property] == true)
                 && !property.annotations.hasAnnotation(TRANSIENT_FQNAME)
         ) {
@@ -103,7 +103,7 @@ class ParcelableDeclarationChecker : SimpleDeclarationChecker {
         // @JvmName is not applicable to property so we can check just the descriptor name
         if (property.name.asString() == "CREATOR" && property.findJvmFieldAnnotation() != null && containingClass.isCompanionObject) {
             val outerClass = containingClass.containingDeclaration as? ClassDescriptor
-            if (outerClass != null && outerClass.isMagicParcelable) {
+            if (outerClass != null && outerClass.isParcelize) {
                 diagnosticHolder.report(ErrorsAndroid.CREATOR_DEFINITION_IS_NOT_ALLOWED.on(declaration.nameIdentifier ?: declaration))
             }
         }
@@ -115,7 +115,7 @@ class ParcelableDeclarationChecker : SimpleDeclarationChecker {
             diagnosticHolder: DiagnosticSink,
             bindingContext: BindingContext
     ) {
-        if (!descriptor.isMagicParcelable) return
+        if (!descriptor.isParcelize) return
 
         if (declaration !is KtClass || (declaration.isAnnotation() || declaration.isInterface())) {
             val reportElement = (declaration as? KtClassOrObject)?.nameIdentifier ?: declaration

plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/ParcelableResolveExtension.kt

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.android.parcel
 
-import kotlinx.android.parcel.MagicParcel
+import kotlinx.android.parcel.Parcelize
 import org.jetbrains.kotlin.android.parcel.ParcelableSyntheticComponent.ComponentKind.*
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.*
@@ -90,13 +90,13 @@ open class ParcelableResolveExtension : SyntheticResolveExtension {
         }
 
         if (name.asString() == DESCRIBE_CONTENTS.methodName
-                && clazz.isMagicParcelable
+                && clazz.isParcelize
                 && isExperimental()
                 && result.none { it.isDescribeContents() }
         ) {
             result += createMethod(clazz, DESCRIBE_CONTENTS, clazz.builtIns.intType)
         } else if (name.asString() == WRITE_TO_PARCEL.methodName
-                && clazz.isMagicParcelable
+                && clazz.isParcelize
                 && isExperimental()
                 && result.none { it.isWriteToParcel() }
         ) {
@@ -133,7 +133,7 @@ interface ParcelableSyntheticComponent {
     }
 }
 
-private val MAGIC_PARCEL_CLASS_FQNAME = FqName(MagicParcel::class.java.canonicalName)
+private val PARCELIZE_CLASS_FQNAME = FqName(Parcelize::class.java.canonicalName)
 
-internal val ClassDescriptor.isMagicParcelable: Boolean
-    get() = this.annotations.hasAnnotation(MAGIC_PARCEL_CLASS_FQNAME)
+internal val ClassDescriptor.isParcelize: Boolean
+    get() = this.annotations.hasAnnotation(PARCELIZE_CLASS_FQNAME)

plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/serializers/ParcelSerializer.kt

@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.android.parcel.serializers
 
-import org.jetbrains.kotlin.android.parcel.isMagicParcelable
+import org.jetbrains.kotlin.android.parcel.isParcelize
 import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
@@ -181,7 +181,7 @@ interface ParcelSerializer {
 
                         val creatorAsmType = when {
                             creatorVar != null -> typeMapper.mapTypeSafe(creatorVar.type)
-                            clazz.isMagicParcelable -> Type.getObjectType(asmType.internalName + "\$Creator")
+                            clazz.isParcelize -> Type.getObjectType(asmType.internalName + "\$Creator")
                             else -> null
                         }
 

plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/diagnostic/DefaultErrorMessagesAndroid.kt

@@ -80,7 +80,7 @@ class DefaultErrorMessagesAndroid : DefaultErrorMessages.Extension {
                     "'CREATOR' definition is not allowed. Use 'Parceler' companion object instead.")
 
             MAP.put(ErrorsAndroid.PARCELABLE_TYPE_NOT_SUPPORTED,
-                    "Type is not directly supported by 'MagicParcelable'. " +
+                    "Type is not directly supported by 'Parcelize'. " +
                     "Annotate the parameter type with '@RawValue' if you want it to be serialized using 'writeValue()'")
         }
     }