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

Support serializable classes clash with JVM primitive types by name

Browse Source 
Fixes Kotlin/kotlinx.serialization#1353
This commit is contained in:
Sergey Shanshin
2021-07-06 12:52:53 +03:00
committed by GitHub
parent 7181631051
commit 0d211a53cb
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/backend/common/TypeUtil.kt
+16 -8
View File
@@ -161,15 +161,23 @@ fun findTypeSerializer(module: ModuleDescriptor, kType: KotlinType): ClassDescri
fun findStandardKotlinTypeSerializer(module: ModuleDescriptor, kType: KotlinType): ClassDescriptor? { fun findStandardKotlinTypeSerializer(module: ModuleDescriptor, kType: KotlinType): ClassDescriptor? {
val name = when (kType.getJetTypeFqName(false)) { val name = when (kType.getJetTypeFqName(false)) {
"Z" -> if (kType.isBoolean()) "BooleanSerializer" else return null
"B" -> if (kType.isByte()) "ByteSerializer" else return null
"S" -> if (kType.isShort()) "ShortSerializer" else return null
"I" -> if (kType.isInt()) "IntSerializer" else return null
"J" -> if (kType.isLong()) "LongSerializer" else return null
"F" -> if (kType.isFloat()) "FloatSerializer" else return null
"D" -> if (kType.isDouble()) "DoubleSerializer" else return null
"C" -> if (kType.isChar()) "CharSerializer" else return null
"kotlin.Unit" -> "UnitSerializer" "kotlin.Unit" -> "UnitSerializer"
"Z", "kotlin.Boolean" -> "BooleanSerializer" "kotlin.Boolean" -> "BooleanSerializer"
"B", "kotlin.Byte" -> "ByteSerializer" "kotlin.Byte" -> "ByteSerializer"
"S", "kotlin.Short" -> "ShortSerializer" "kotlin.Short" -> "ShortSerializer"
"I", "kotlin.Int" -> "IntSerializer" "kotlin.Int" -> "IntSerializer"
"J", "kotlin.Long" -> "LongSerializer" "kotlin.Long" -> "LongSerializer"
"F", "kotlin.Float" -> "FloatSerializer" "kotlin.Float" -> "FloatSerializer"
"D", "kotlin.Double" -> "DoubleSerializer" "kotlin.Double" -> "DoubleSerializer"
"C", "kotlin.Char" -> "CharSerializer" "kotlin.Char" -> "CharSerializer"
"kotlin.UInt" -> "UIntSerializer" "kotlin.UInt" -> "UIntSerializer"
"kotlin.ULong" -> "ULongSerializer" "kotlin.ULong" -> "ULongSerializer"
"kotlin.UByte" -> "UByteSerializer" "kotlin.UByte" -> "UByteSerializer"