New J2K: Fix nullability for converted primitive types

2018-06-13 19:43:13 +03:00
parent 72c88c9003
commit 279c835d04
1 changed files with 8 additions and 2 deletions
@@ -59,7 +59,13 @@ class TypeMappingConversion(val context: ConversionContext) : RecursiveApplicabl
    private fun mapPrimitiveType(type: JKJavaPrimitiveType, typeElement: JKTypeElement): JKTypeElement {
        val fqName = type.jvmPrimitiveType.primitiveType.typeFqName

-        return classTypeByFqName(context.backAnnotator(typeElement), ClassId.topLevel(fqName), emptyList())?.let { JKTypeElementImpl(it) }
-                ?: typeElement
+        val convertedType = classTypeByFqName(
+            context.backAnnotator(typeElement),
+            ClassId.topLevel(fqName),
+            emptyList(),
+            nullability = Nullability.NotNull
+        ) ?: return typeElement
+
+        return JKTypeElementImpl(convertedType)
    }
 }