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

[Commonizer] Generate correct TA types for callable descriptors

Browse Source 
Issue #KMM-217
This commit is contained in:
Dmitriy Dolovov
2020-04-17 23:06:23 +07:00
parent 2938b69ff5
commit a6064ecda6
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/builder/builderUtils.kt
+11 -2
View File
@@ -122,7 +122,8 @@ internal fun CirSimpleType.buildType(
// TODO: commonize annotations, KT-34234 // TODO: commonize annotations, KT-34234
val typeAnnotations = if (!targetComponents.isCommon) annotations.buildDescriptors(targetComponents) else Annotations.EMPTY val typeAnnotations = if (!targetComponents.isCommon) annotations.buildDescriptors(targetComponents) else Annotations.EMPTY
val rawType = simpleType(
val simpleType = simpleType(
annotations = typeAnnotations, annotations = typeAnnotations,
constructor = classifier.typeConstructor, constructor = classifier.typeConstructor,
arguments = arguments.map { it.buildArgument(targetComponents, typeParameterResolver) }, arguments = arguments.map { it.buildArgument(targetComponents, typeParameterResolver) },
@@ -130,7 +131,15 @@ internal fun CirSimpleType.buildType(
kotlinTypeRefiner = null 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( internal fun findClassOrTypeAlias(