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

Add support of nullable serializers to UseSerializers annotation (#3906)

Browse Source 
Fixes Kotlin/kotlinx.serialization#984
This commit is contained in:
Sergey Shanshin
2020-11-24 16:34:02 +03:00
committed by GitHub
parent 6c7247cbd3
commit 176071b7db
1 changed files with 0 additions and 3 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
View File
@@ -125,9 +125,6 @@ fun AbstractSerialGenerator.findTypeSerializerOrContextUnchecked(
if (kType.isTypeParameter()) return null if (kType.isTypeParameter()) return null
annotations.serializableWith(module)?.let { return it.toClassDescriptor } annotations.serializableWith(module)?.let { return it.toClassDescriptor }
additionalSerializersInScopeOfCurrentFile[kType]?.let { return it } additionalSerializersInScopeOfCurrentFile[kType]?.let { return it }
if (!kType.isMarkedNullable) {
additionalSerializersInScopeOfCurrentFile[kType.makeNullable()]?.let { return it }
}
if (kType in contextualKClassListInCurrentFile) return module.getClassFromSerializationPackage(SpecialBuiltins.contextSerializer) if (kType in contextualKClassListInCurrentFile) return module.getClassFromSerializationPackage(SpecialBuiltins.contextSerializer)
return analyzeSpecialSerializers(module, annotations) ?: findTypeSerializer(module, kType) return analyzeSpecialSerializers(module, annotations) ?: findTypeSerializer(module, kType)