[Commonizer] Generate correct TA types for callable descriptors

Issue #KMM-217
JetBrains · Apr 17, 2020 · a6064ec · a6064ec
1 parent 2938b69
commit a6064ec
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt
@@ -122,15 +122,24 @@ internal fun CirSimpleType.buildType(
 
     // TODO: commonize annotations, KT-34234
     val typeAnnotations = if (!targetComponents.isCommon) annotations.buildDescriptors(targetComponents) else Annotations.EMPTY
-    val rawType = simpleType(
+
+    val simpleType = simpleType(
         annotations = typeAnnotations,
         constructor = classifier.typeConstructor,
         arguments = arguments.map { it.buildArgument(targetComponents, typeParameterResolver) },
         nullable = isMarkedNullable,
         kotlinTypeRefiner = null
     )
 
-    return if (isDefinitelyNotNullType) rawType.makeSimpleTypeDefinitelyNotNullOrNotNull() else rawType
+    val computedType = if (classifier is TypeAliasDescriptor)
+        classifier.underlyingType.withAbbreviation(simpleType)
+    else
+        simpleType
+
+    return if (isDefinitelyNotNullType)
+        computedType.makeSimpleTypeDefinitelyNotNullOrNotNull()
+    else
+        computedType
 }
 
 internal fun findClassOrTypeAlias(