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

Don't add GeneratedSerializer as a supertype for user-defined serializers

Browse Source
This commit is contained in:
Leonid Startsev
2018-11-08 17:43:30 +03:00
parent a3e34af2f1
commit 1535426a11
2 changed files with 15 additions and 8 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/KSerializationUtil.kt
+5 -3
View File
@@ -41,14 +41,16 @@ fun isKSerializer(type: KotlinType?): Boolean =
fun isGeneratedKSerializer(type: KotlinType?): Boolean = fun isGeneratedKSerializer(type: KotlinType?): Boolean =
type != null && KotlinBuiltIns.isConstructedFromGivenClass(type, SerialEntityNames.GENERATED_SERIALIZER_FQ) type != null && KotlinBuiltIns.isConstructedFromGivenClass(type, SerialEntityNames.GENERATED_SERIALIZER_FQ)
fun ClassDescriptor.getKSerializerDescriptor(): ClassDescriptor = fun ClassDescriptor.getGeneratedSerializerDescriptor(): ClassDescriptor =
module.getClassFromInternalSerializationPackage(SerialEntityNames.GENERATED_SERIALIZER_CLASS.identifier) module.getClassFromInternalSerializationPackage(SerialEntityNames.GENERATED_SERIALIZER_CLASS.identifier)
fun ClassDescriptor.createGeneratedSerializerTypeFor(argument: SimpleType): SimpleType { fun ClassDescriptor.createSerializerTypeFor(argument: SimpleType, baseSerializerInterface: FqName): SimpleType {
val projectionType = Variance.INVARIANT val projectionType = Variance.INVARIANT
val types = listOf(TypeProjectionImpl(projectionType, argument)) val types = listOf(TypeProjectionImpl(projectionType, argument))
return KotlinTypeFactory.simpleNotNullType(Annotations.EMPTY, getKSerializerDescriptor(), types) val descriptor = module.findClassAcrossModuleDependencies(ClassId.topLevel(baseSerializerInterface))
?: throw IllegalArgumentException("Can't locate $baseSerializerInterface")
return KotlinTypeFactory.simpleNotNullType(Annotations.EMPTY, descriptor, types)
} }
internal fun extractKSerializerArgumentFromImplementation(implementationClass: ClassDescriptor): KotlinType? { internal fun extractKSerializerArgumentFromImplementation(implementationClass: ClassDescriptor): KotlinType? {
plugins/kotlin-serialization/kotlin-serialization-compiler/src/org/jetbrains/kotlinx/serialization/compiler/resolve/KSerializerDescriptorResolver.kt
+10 -5
View File
@@ -57,9 +57,14 @@ object KSerializerDescriptorResolver {
fun addSerializerSupertypes(classDescriptor: ClassDescriptor, supertypes: MutableList<KotlinType>) { fun addSerializerSupertypes(classDescriptor: ClassDescriptor, supertypes: MutableList<KotlinType>) {
val serializableClassDescriptor = getSerializableClassDescriptorBySerializer(classDescriptor) ?: return val serializableClassDescriptor = getSerializableClassDescriptorBySerializer(classDescriptor) ?: return
if (supertypes.none(::isKSerializer)) { if (supertypes.any(::isKSerializer)) return
supertypes.add(classDescriptor.createGeneratedSerializerTypeFor(serializableClassDescriptor.defaultType))
} // Add GeneratedSerializer as superinterface for generated $serializer class, and KSerializer to all others
val fqName = if (classDescriptor.name == SerialEntityNames.SERIALIZER_CLASS_NAME)
SerialEntityNames.GENERATED_SERIALIZER_FQ
else
SerialEntityNames.KSERIALIZER_NAME_FQ
supertypes.add(classDescriptor.createSerializerTypeFor(serializableClassDescriptor.defaultType, fqName))
} }
fun addSerialInfoImplClass( fun addSerialInfoImplClass(
@@ -196,7 +201,7 @@ object KSerializerDescriptorResolver {
name: Name name: Name
): PropertyDescriptor { ): PropertyDescriptor {
val typeParam = listOf(createProjection(classDescriptor.defaultType, Variance.INVARIANT, null)) val typeParam = listOf(createProjection(classDescriptor.defaultType, Variance.INVARIANT, null))
val propertyFromSerializer = companionDescriptor.getKSerializerDescriptor().getMemberScope(typeParam) val propertyFromSerializer = companionDescriptor.getGeneratedSerializerDescriptor().getMemberScope(typeParam)
.getContributedVariables(name, NoLookupLocation.FROM_BUILTINS).single() .getContributedVariables(name, NoLookupLocation.FROM_BUILTINS).single()
val propertyDescriptor = PropertyDescriptorImpl.create( val propertyDescriptor = PropertyDescriptorImpl.create(
@@ -236,7 +241,7 @@ object KSerializerDescriptorResolver {
?: throw AssertionError("Serializer does not implement ${SerialEntityNames.KSERIALIZER_CLASS}??") ?: throw AssertionError("Serializer does not implement ${SerialEntityNames.KSERIALIZER_CLASS}??")
val typeParam = listOf(createProjection(serializableClassOnImplSite, Variance.INVARIANT, null)) val typeParam = listOf(createProjection(serializableClassOnImplSite, Variance.INVARIANT, null))
val functionFromSerializer = companionDescriptor.getKSerializerDescriptor().getMemberScope(typeParam) val functionFromSerializer = companionDescriptor.getGeneratedSerializerDescriptor().getMemberScope(typeParam)
.getContributedFunctions(name, NoLookupLocation.FROM_BUILTINS).single() .getContributedFunctions(name, NoLookupLocation.FROM_BUILTINS).single()
functionDescriptor.initialize( functionDescriptor.initialize(