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

Parcelize: Serialize primitive arrays correctly when the custom parceler is provided.

Browse Source 
This fixes failing 'customSerializerBoxing' test.
This commit is contained in:
Yan Zhulanow
2018-04-16 23:59:25 +03:00
parent defe97e4ef
commit ee37bcf14b
1 changed files with 25 additions and 15 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
+25 -15
View File
@@ -83,27 +83,37 @@ interface ParcelSerializer {
val className = asmType.className val className = asmType.className
fun strict() = strict && !type.annotations.hasAnnotation(RAWVALUE_ANNOTATION_FQNAME) fun strict() = strict && !type.annotations.hasAnnotation(RAWVALUE_ANNOTATION_FQNAME)
type.annotations.findAnnotation(WRITE_WITH_FQNAME)?.let { writeWith -> fun findCustomParcelerType(type: KotlinType): KotlinType? {
val parceler = writeWith.type.arguments.singleOrNull()?.type type.annotations.findAnnotation(WRITE_WITH_FQNAME)?.let { writeWith ->
if (parceler != null && !parceler.isError) { val parceler = writeWith.type.arguments.singleOrNull()?.type
return TypeParcelerParcelSerializer(asmType, parceler, context.typeMapper) if (parceler != null && !parceler.isError) {
return parceler
}
} }
return context.findParcelerClass(type)?.takeIf { !it.isError }
} }
context.findParcelerClass(type)?.let { typeParceler -> findCustomParcelerType(type)?.let { return TypeParcelerParcelSerializer(asmType, it, context.typeMapper) }
if (!typeParceler.isError) {
return TypeParcelerParcelSerializer(asmType, typeParceler, context.typeMapper)
}
}
return when { return when {
asmType.descriptor == "[I" asmType.descriptor == "[I"
|| asmType.descriptor == "[Z" || asmType.descriptor == "[Z"
|| asmType.descriptor == "[B" || asmType.descriptor == "[B"
|| asmType.descriptor == "[C" || asmType.descriptor == "[C"
|| asmType.descriptor == "[D" || asmType.descriptor == "[S"
|| asmType.descriptor == "[F" || asmType.descriptor == "[D"
|| asmType.descriptor == "[L" -> PrimitiveArrayParcelSerializer(asmType) || asmType.descriptor == "[F"
|| asmType.descriptor == "[J" -> {
val customElementParcelerType = findCustomParcelerType(type.builtIns.getArrayElementType(type))
if (customElementParcelerType != null) {
val elementType = asmType.elementType
val elementParceler = TypeParcelerParcelSerializer(elementType, customElementParcelerType, context.typeMapper)
ArrayParcelSerializer(asmType, elementParceler)
} else {
PrimitiveArrayParcelSerializer(asmType)
}
}
asmType.descriptor == "[Landroid/os/IBinder;" -> NullCompliantObjectParcelSerializer(asmType, asmType.descriptor == "[Landroid/os/IBinder;" -> NullCompliantObjectParcelSerializer(asmType,
Method("writeBinderArray"), Method("createBinderArray")) Method("writeBinderArray"), Method("createBinderArray"))