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

Fix order of overriding @Serializable(with) on property: check override, than @ContextualSerialization.

Browse Source 
This will apply Context serializer event if class annotated @Serializable
This commit is contained in:
Leonid Startsev
2018-10-11 17:51:16 +03:00
parent abb8e5e914
commit ef42201b05
1 changed files with 10 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/resolve/SerializableProperty.kt
+10 -1
View File
@@ -19,17 +19,26 @@ package org.jetbrains.kotlinx.serialization.compiler.resolve
import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.descriptors.annotations.Annotations
import org.jetbrains.kotlin.psi.ValueArgument import org.jetbrains.kotlin.psi.ValueArgument
import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.resolve.descriptorUtil.module
import org.jetbrains.kotlin.types.KotlinType
class SerializableProperty(val descriptor: PropertyDescriptor, val isConstructorParameterWithDefault: Boolean) { class SerializableProperty(val descriptor: PropertyDescriptor, val isConstructorParameterWithDefault: Boolean) {
val name = descriptor.annotations.serialNameValue ?: descriptor.name.asString() val name = descriptor.annotations.serialNameValue ?: descriptor.name.asString()
val type = descriptor.type val type = descriptor.type
val genericIndex = type.genericIndex val genericIndex = type.genericIndex
val module = descriptor.module val module = descriptor.module
val serializableWith = descriptor.annotations.serializableWith?.let { checkSerializerNullability(type, it) } val serializableWith = extractSerializableWith(descriptor.annotations)
val optional = descriptor.annotations.serialOptional val optional = descriptor.annotations.serialOptional
val transient = descriptor.annotations.serialTransient val transient = descriptor.annotations.serialTransient
val annotationsWithArguments: List<Triple<ClassDescriptor, List<ValueArgument>, List<ValueParameterDescriptor>>> = val annotationsWithArguments: List<Triple<ClassDescriptor, List<ValueArgument>, List<ValueParameterDescriptor>>> =
descriptor.annotationsWithArguments() descriptor.annotationsWithArguments()
private fun extractSerializableWith(annotations: Annotations): KotlinType? {
annotations.serializableWith?.let { return it }
if (annotations.hasAnnotation(SerializationAnnotations.contextualFqName))
return module.getClassFromSerializationPackage(SpecialBuiltins.contextSerializer).defaultType
return null
}
} }