New J2K: Fix nullability for converted primitive types
This commit is contained in:
committed by
Ilya Kirillov
parent
72c88c9003
commit
279c835d04
@@ -59,7 +59,13 @@ class TypeMappingConversion(val context: ConversionContext) : RecursiveApplicabl
|
|||||||
private fun mapPrimitiveType(type: JKJavaPrimitiveType, typeElement: JKTypeElement): JKTypeElement {
|
private fun mapPrimitiveType(type: JKJavaPrimitiveType, typeElement: JKTypeElement): JKTypeElement {
|
||||||
val fqName = type.jvmPrimitiveType.primitiveType.typeFqName
|
val fqName = type.jvmPrimitiveType.primitiveType.typeFqName
|
||||||
|
|
||||||
return classTypeByFqName(context.backAnnotator(typeElement), ClassId.topLevel(fqName), emptyList())?.let { JKTypeElementImpl(it) }
|
val convertedType = classTypeByFqName(
|
||||||
?: typeElement
|
context.backAnnotator(typeElement),
|
||||||
|
ClassId.topLevel(fqName),
|
||||||
|
emptyList(),
|
||||||
|
nullability = Nullability.NotNull
|
||||||
|
) ?: return typeElement
|
||||||
|
|
||||||
|
return JKTypeElementImpl(convertedType)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user