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

Fix instantiation of generic serializers on JS

Browse Source 
(Kotlin/kotlinx.serialization/244, which was fixed already by lookuping descriptor, but still had a bug)
This commit is contained in:
Leonid Startsev
2018-10-30 15:50:24 +03:00
parent a163e62f5f
commit 80c262ec66
1 changed files with 4 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/backend/js/JsCodegenUtil.kt
+4 -1
View File
@@ -160,7 +160,10 @@ internal fun SerializerJsTranslator.serializerInstance(
val desc = requireNotNull( val desc = requireNotNull(
KSerializerDescriptorResolver.findSerializerConstructorForTypeArgumentsSerializers(serializerClass) KSerializerDescriptorResolver.findSerializerConstructorForTypeArgumentsSerializers(serializerClass)
) { "Generated serializer does not have constructor with required number of arguments" } ) { "Generated serializer does not have constructor with required number of arguments" }
JsInvocation(context.getInnerReference(desc), args) if (!desc.isPrimary)
JsInvocation(context.getInnerReference(desc), args)
else
JsNew(context.getInnerReference(desc), args)
} else { } else {
JsNew(context.translateQualifiedReference(serializerClass), args) JsNew(context.translateQualifiedReference(serializerClass), args)
} }