未验证 提交 10d9259d 编写于 作者: S Sergey Shanshin 提交者: GitHub

Returned support for nullable types by not null serializers

Fixes Kotlin/kotlinx.serialization#1265
上级 b476f1cc
...@@ -125,7 +125,7 @@ fun AbstractSerialGenerator.findTypeSerializerOrContextUnchecked( ...@@ -125,7 +125,7 @@ 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) return findTypeSerializerOrContextUnchecked(module, kType.makeNotNullable())
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)
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册