Move UL compiler plugin support to separate extension point

2019-10-09 19:53:19 +03:00
parent 6ce37fff95
commit 3f9bffcc5f
23 changed files with 304 additions and 400 deletions
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.android.parcel
-
-import org.jetbrains.kotlin.util.isAnnotated
-import org.jetbrains.kotlin.util.isOrdinaryClass
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.extensions.LightClassApplicabilityCheckExtension
-import org.jetbrains.kotlin.extensions.LightClassApplicabilityType
-import org.jetbrains.kotlin.psi.KtDeclaration
-import org.jetbrains.kotlin.extensions.LightClassApplicabilityType.LightClass
-import org.jetbrains.kotlin.extensions.LightClassApplicabilityType.UltraLightClass
-
-class IDEParcelableApplicabilityExtension : LightClassApplicabilityCheckExtension {
-
-    override fun checkApplicabilityType(declaration: KtDeclaration, descriptor: Lazy<DeclarationDescriptor?>): LightClassApplicabilityType {
-
-        return UltraLightClass
-//        if (!declaration.isOrdinaryClass || !declaration.isAnnotated) return UltraLightClass
-//
-//        val descriptorValue = descriptor.value ?: return UltraLightClass
-//
-//        val classDescriptor = (descriptorValue as? ClassDescriptor)
-//            ?: descriptorValue.containingDeclaration as? ClassDescriptor
-//            ?: return UltraLightClass
-//
-//        return if (classDescriptor.isParcelize) LightClass else UltraLightClass
-    }
-}
@@ -5,100 +5,13 @@

 package org.jetbrains.kotlin.android.parcel

-import com.intellij.psi.impl.light.LightFieldBuilder
 import org.jetbrains.kotlin.android.synthetic.idea.androidExtensionsIsExperimental
-import org.jetbrains.kotlin.asJava.UltraLightClassCodegenSupport
-import org.jetbrains.kotlin.asJava.classes.KtUltraLightClass
-import org.jetbrains.kotlin.asJava.classes.createGeneratedMethodFromDescriptor
-import org.jetbrains.kotlin.asJava.elements.*
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.idea.caches.project.getModuleInfo
-import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtElement
-import org.jetbrains.kotlin.util.isAnnotated
-import org.jetbrains.kotlin.util.isOrdinaryClass

-class IDEParcelableCodegenExtension : ParcelableCodegenExtension(), UltraLightClassCodegenSupport {
+class IDEParcelableCodegenExtension : ParcelableCodegenExtension() {
    override fun isExperimental(element: KtElement): Boolean {
        val moduleInfo = element.getModuleInfo()
        return moduleInfo.androidExtensionsIsExperimental
    }
-
-    private fun tryGetParcelableClass(
-        declaration: KtDeclaration,
-        descriptor: Lazy<DeclarationDescriptor?>
-    ): ClassDescriptor? {
-
-        if (!declaration.isOrdinaryClass || !declaration.isAnnotated) return null
-
-        val descriptorValue = descriptor.value ?: return null
-
-        val parcelableClass = (descriptorValue as? ClassDescriptor)
-            ?: descriptorValue.containingDeclaration as? ClassDescriptor
-            ?: return null
-
-        if (!parcelableClass.isParcelableClassDescriptor) return null
-
-        return parcelableClass
-    }
-
-    override fun interceptFieldsBuilding(
-        declaration: KtDeclaration,
-        descriptor: Lazy<DeclarationDescriptor?>,
-        containingDeclaration: KtUltraLightClass,
-        fieldsList: MutableList<KtLightField>
-    ) {
-
-        val parcelableClass = tryGetParcelableClass(
-            declaration = declaration,
-            descriptor = descriptor
-        ) ?: return
-
-        if (parcelableClass.hasCreatorField()) return
-
-        val fieldWrapper = KtLightFieldImpl.KtLightFieldForSourceDeclaration(
-            origin = null,
-            computeDelegate = {
-                LightFieldBuilder("CREATOR", "android.os.Parcelable.Creator", containingDeclaration).also {
-                    it.setModifiers("public", "static", "final")
-                }
-            },
-            containingClass = containingDeclaration,
-            dummyDelegate = null
-        )
-
-        fieldsList.add(fieldWrapper)
-    }
-
-    override fun interceptMethodsBuilding(
-        declaration: KtDeclaration,
-        descriptor: Lazy<DeclarationDescriptor?>,
-        containingDeclaration: KtUltraLightClass,
-        methodsList: MutableList<KtLightMethod>
-    ) {
-
-        val parcelableClass = tryGetParcelableClass(
-            declaration = declaration,
-            descriptor = descriptor
-        ) ?: return
-
-        with(parcelableClass) {
-            if (hasSyntheticDescribeContents()) {
-                findFunction(ParcelableSyntheticComponent.ComponentKind.DESCRIBE_CONTENTS)?.let {
-                    methodsList.add(
-                        containingDeclaration.createGeneratedMethodFromDescriptor(it)
-                    )
-                }
-            }
-
-            if (hasSyntheticWriteToParcel()) {
-                findFunction(ParcelableSyntheticComponent.ComponentKind.WRITE_TO_PARCEL)?.let {
-                    methodsList.add(
-                        containingDeclaration.createGeneratedMethodFromDescriptor(it)
-                    )
-                }
-            }
-        }
-    }
 }
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.android.parcel
+
+import com.intellij.psi.impl.light.LightFieldBuilder
+import org.jetbrains.kotlin.android.parcel.serializers.ParcelableExtensionBase
+import org.jetbrains.kotlin.asJava.UltraLightClassModifierExtension
+import org.jetbrains.kotlin.asJava.classes.KtUltraLightClass
+import org.jetbrains.kotlin.asJava.classes.createGeneratedMethodFromDescriptor
+import org.jetbrains.kotlin.asJava.elements.KtLightField
+import org.jetbrains.kotlin.asJava.elements.KtLightFieldImpl
+import org.jetbrains.kotlin.asJava.elements.KtLightMethod
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.psi.KtDeclaration
+import org.jetbrains.kotlin.util.isAnnotated
+import org.jetbrains.kotlin.util.isOrdinaryClass
+
+class ParcelableUltraLightClassModifierExtension : ParcelableExtensionBase, UltraLightClassModifierExtension {
+
+    private fun tryGetParcelableClass(
+        declaration: KtDeclaration,
+        descriptor: Lazy<DeclarationDescriptor?>
+    ): ClassDescriptor? {
+
+        if (!declaration.isOrdinaryClass || !declaration.isAnnotated) return null
+
+        val descriptorValue = descriptor.value ?: return null
+
+        val parcelableClass = (descriptorValue as? ClassDescriptor)
+            ?: descriptorValue.containingDeclaration as? ClassDescriptor
+            ?: return null
+
+        if (!parcelableClass.isParcelableClassDescriptor) return null
+
+        return parcelableClass
+    }
+
+    override fun interceptFieldsBuilding(
+        declaration: KtDeclaration,
+        descriptor: Lazy<DeclarationDescriptor?>,
+        containingDeclaration: KtUltraLightClass,
+        fieldsList: MutableList<KtLightField>
+    ) {
+
+        val parcelableClass = tryGetParcelableClass(
+            declaration = declaration,
+            descriptor = descriptor
+        ) ?: return
+
+        if (parcelableClass.hasCreatorField()) return
+
+        val fieldWrapper = KtLightFieldImpl.KtLightFieldForSourceDeclaration(
+            origin = null,
+            computeDelegate = {
+                LightFieldBuilder("CREATOR", "android.os.Parcelable.Creator", containingDeclaration).also {
+                    it.setModifiers("public", "static", "final")
+                }
+            },
+            containingClass = containingDeclaration,
+            dummyDelegate = null
+        )
+
+        fieldsList.add(fieldWrapper)
+    }
+
+    override fun interceptMethodsBuilding(
+        declaration: KtDeclaration,
+        descriptor: Lazy<DeclarationDescriptor?>,
+        containingDeclaration: KtUltraLightClass,
+        methodsList: MutableList<KtLightMethod>
+    ) {
+
+        val parcelableClass = tryGetParcelableClass(
+            declaration = declaration,
+            descriptor = descriptor
+        ) ?: return
+
+        with(parcelableClass) {
+            if (hasSyntheticDescribeContents()) {
+                findFunction(ParcelableSyntheticComponent.ComponentKind.DESCRIBE_CONTENTS)?.let {
+                    methodsList.add(
+                        containingDeclaration.createGeneratedMethodFromDescriptor(it)
+                    )
+                }
+            }
+
+            if (hasSyntheticWriteToParcel()) {
+                findFunction(ParcelableSyntheticComponent.ComponentKind.WRITE_TO_PARCEL)?.let {
+                    methodsList.add(
+                        containingDeclaration.createGeneratedMethodFromDescriptor(it)
+                    )
+                }
+            }
+        }
+    }
+
+}