Revert "Fix typealias usage nullability and annotations lost in deserialization"

This reverts commit 070848a1
This commit is contained in:
Sergey Igushkin
2020-08-05 20:17:49 +04:00
parent 5edbc75d7b
commit 093d4b3108
4 changed files with 2 additions and 47 deletions
@@ -92,12 +92,8 @@ class TypeDeserializer(
val declarationDescriptor = constructor.declarationDescriptor
val simpleType = when {
expandTypeAliases && declarationDescriptor is TypeAliasDescriptor -> {
val expandedType = with(KotlinTypeFactory) { declarationDescriptor.computeExpandedType(arguments) }
expandedType
.makeNullableAsSpecified(proto.nullable)
.replaceAnnotations(Annotations.create(annotations + expandedType.annotations))
}
expandTypeAliases && declarationDescriptor is TypeAliasDescriptor ->
with(KotlinTypeFactory) { declarationDescriptor.computeExpandedType(arguments) }
Flags.SUSPEND_TYPE.get(proto.flags) ->
createSuspendFunctionType(annotations, constructor, arguments, proto.nullable)
else ->