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

Parcelable: Use efficient serialize strategy for Java/Kotlin Parcelables only from the current source roots (KT-20029)

Browse Source
This commit is contained in:
Yan Zhulanow
2017-09-07 20:22:13 +03:00
committed by Yan Zhulanow
parent 1b688182cd
commit eefb490a8a
6 changed files with 291 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/parcel/serializers/ParcelSerializer.kt
+12 -2
View File
@@ -22,10 +22,13 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.DescriptorUtils
import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameSafe
import org.jetbrains.kotlin.resolve.scopes.MemberScope
import org.jetbrains.kotlin.resolve.source.PsiSourceElement
import org.jetbrains.kotlin.synthetic.isVisibleOutside
import org.jetbrains.kotlin.types.KotlinType
import org.jetbrains.kotlin.types.TypeUtils
@@ -199,10 +202,17 @@ interface ParcelSerializer {
type.isParcelable() -> {
val clazz = type.constructor.declarationDescriptor as? ClassDescriptor
if (clazz != null && clazz.modality == Modality.FINAL) {
val creatorVar = clazz.staticScope.getContributedVariables(
if (clazz != null && clazz.modality == Modality.FINAL && clazz.source is PsiSourceElement) {
fun MemberScope.findCreatorField() = getContributedVariables(
Name.identifier("CREATOR"), NoLookupLocation.WHEN_GET_ALL_DESCRIPTORS).firstOrNull()
val creatorVar = when (clazz) {
is JavaClassDescriptor -> clazz.staticScope.findCreatorField()
else -> clazz.companionObjectDescriptor?.unsubstitutedMemberScope?.findCreatorField()
?.takeIf { it.annotations.hasAnnotation(FqName(JvmField::class.java.name)) }
}
val creatorAsmType = when {
creatorVar != null -> typeMapper.mapTypeSafe(creatorVar.type)
clazz.isParcelize -> Type.getObjectType(asmType.internalName + "\$Creator")