[Commonizer] Restore lost nullability for underlying types in TAs

2021-01-26 13:20:29 +03:00
parent 85f79695b9
commit 08cc904a71
1 changed files with 6 additions and 1 deletions
@@ -57,9 +57,14 @@ object CirTypeFactory {
                    Annotations.EMPTY
                ) as AbbreviatedType

+                val expandedType = extractExpandedType(abbreviatedType)
+
+                val cirExpandedType = create(expandedType, useAbbreviation = true) as CirClassOrTypeAliasType
+                val cirExpandedTypeWithProperNullability = if (source.isMarkedNullable) makeNullable(cirExpandedType) else cirExpandedType
+
                createTypeAliasType(
                    typeAliasId = classifierDescriptor.internedClassId,
-                    underlyingType = create(extractExpandedType(abbreviatedType), useAbbreviation = true) as CirClassOrTypeAliasType,
+                    underlyingType = cirExpandedTypeWithProperNullability,
                    arguments = createArguments(source.arguments, useAbbreviation = true),
                    isMarkedNullable = source.isMarkedNullable
                )