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

Search for standard serializers in both internal and root packages

Browse Source 
To allow graduate migration of some classes (e.g. IntSerializer)
from kotlinx.serialization.internal.* to kotlinx.serialization.*
This commit is contained in:
Leonid Startsev
2020-01-20 18:00:40 +03:00
parent db4273d677
commit 9e8f21cc20
1 changed files with 3 additions and 1 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
+3 -1
View File
@@ -214,7 +214,9 @@ fun findStandardKotlinTypeSerializer(module: ModuleDescriptor, kType: KotlinType
"java.util.Map.Entry" -> "MapEntrySerializer"
else -> return null
}
return module.findClassAcrossModuleDependencies(ClassId(internalPackageFqName, Name.identifier(name)))
val identifier = Name.identifier(name)
return module.findClassAcrossModuleDependencies(ClassId(internalPackageFqName, identifier))
?: module.findClassAcrossModuleDependencies(ClassId(SerializationPackages.packageFqName, identifier))
}
fun findEnumTypeSerializer(module: ModuleDescriptor, kType: KotlinType): ClassDescriptor? {