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

Increase priority of @ContextualSerialization annotation on types

Browse Source
This commit is contained in:
Leonid Startsev
2018-11-22 17:05:50 +03:00
parent f13f54d5ad
commit 7e32e2e9b9
1 changed files with 7 additions and 7 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
+7 -7
View File
@@ -101,13 +101,13 @@ fun AbstractSerialGenerator.findTypeSerializerOrContext(
if (annotations.hasAnnotation(SerializationAnnotations.contextualFqName) || kType in contextualKClassListInCurrentFile) if (annotations.hasAnnotation(SerializationAnnotations.contextualFqName) || kType in contextualKClassListInCurrentFile)
module.getClassFromSerializationPackage(SpecialBuiltins.contextSerializer) module.getClassFromSerializationPackage(SpecialBuiltins.contextSerializer)
else else
throw CompilationException( null
"Serializer for element of type $kType has not been found.\n" + return getContextualSerializer() ?: findTypeSerializer(module, kType) ?: throw CompilationException(
"To use context serializer as fallback, explicitly annotate element with @ContextualSerializer", "Serializer for element of type $kType has not been found.\n" +
null, "To use context serializer as fallback, explicitly annotate element with @ContextualSerializer",
sourceElement null,
) sourceElement
return findTypeSerializer(module, kType) ?: getContextualSerializer() )
} }
fun findTypeSerializer(module: ModuleDescriptor, kType: KotlinType): ClassDescriptor? { fun findTypeSerializer(module: ModuleDescriptor, kType: KotlinType): ClassDescriptor? {