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

Better lookup for serializer() function in companion for generic classes because user can define a parameterless shorthand one

Browse Source 
Fixes Kotlin/kotlinx.serialization/#228
This commit is contained in:
Leonid Startsev
2018-10-08 13:57:43 +03:00
parent 077f51e2f4
commit 104368de3b
1 changed files with 9 additions and 2 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/SerializableCompanionCodegen.kt
+9 -2
View File
@@ -18,10 +18,11 @@ package org.jetbrains.kotlinx.serialization.compiler.backend.common
import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.psi2ir.findSingleFunction import org.jetbrains.kotlin.incremental.components.NoLookupLocation
import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlinx.serialization.compiler.resolve.SerialEntityNames.SERIALIZER_PROVIDER_NAME import org.jetbrains.kotlinx.serialization.compiler.resolve.SerialEntityNames.SERIALIZER_PROVIDER_NAME
import org.jetbrains.kotlinx.serialization.compiler.resolve.getSerializableClassDescriptorByCompanion import org.jetbrains.kotlinx.serialization.compiler.resolve.getSerializableClassDescriptorByCompanion
import org.jetbrains.kotlinx.serialization.compiler.resolve.isKSerializer
abstract class SerializableCompanionCodegen( abstract class SerializableCompanionCodegen(
protected val companionDescriptor: ClassDescriptor, protected val companionDescriptor: ClassDescriptor,
@@ -30,7 +31,13 @@ abstract class SerializableCompanionCodegen(
protected val serializableDescriptor: ClassDescriptor = getSerializableClassDescriptorByCompanion(companionDescriptor)!! protected val serializableDescriptor: ClassDescriptor = getSerializableClassDescriptorByCompanion(companionDescriptor)!!
fun generate() { fun generate() {
val serializerGetterDescriptor = companionDescriptor.unsubstitutedMemberScope.findSingleFunction(SERIALIZER_PROVIDER_NAME) val serializerGetterDescriptor = companionDescriptor.unsubstitutedMemberScope.getContributedFunctions(
SERIALIZER_PROVIDER_NAME,
NoLookupLocation.FROM_BACKEND
).first { func ->
func.valueParameters.size == serializableDescriptor.declaredTypeParameters.size &&
func.valueParameters.all { isKSerializer(it.type) }
}
generateSerializerGetter(serializerGetterDescriptor) generateSerializerGetter(serializerGetterDescriptor)
} }