From 8f26bc646ec370508538f18f2fbca673c647ea25 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 17 Nov 2014 18:59:35 +0300 Subject: [PATCH] Fix containing declarations for deserialized type parameters of top-level functions --- .../jetbrains/jet/descriptors/serialization/context/context.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt index 9158f3e81d1..3f85fb5f24c 100644 --- a/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt +++ b/core/serialization/src/org/jetbrains/jet/descriptors/serialization/context/context.kt @@ -105,7 +105,8 @@ class DeserializationContextWithTypes( ): DeserializationContextWithTypes { val childTypeParameterResolver = object : TypeDeserializer.TypeParameterResolver { override fun getTypeParameters(typeDeserializer: TypeDeserializer): List { - val descriptors = deserializer.typeParameters(typeParameterProtos, typeDeserializer) + val childDeserializer = MemberDeserializer(withTypes(descriptor, typeDeserializer)) + val descriptors = childDeserializer.typeParameters(typeParameterProtos, typeDeserializer) typeParameters.addAll(descriptors) return descriptors }