New J2K: Fix nullability preserving in AST conversions

This commit is contained in:
Ilya Kirillov
2019-03-21 23:04:18 +03:00
committed by Ilya Kirillov
parent bdd773f806
commit dff4ab2437
2 changed files with 3 additions and 3 deletions
@@ -44,7 +44,7 @@ class ArrayInitializerConversion(private val context: ConversionContext) : Recur
JKJavaMethodCallExpressionImpl(
context.symbolProvider.provideByFqName("kotlin/arrayOfNulls"),
JKArgumentListImpl(dimensions[0]),
JKTypeArgumentListImpl(listOf(JKTypeElementImpl(type.updateNullability(Nullability.NotNull))))
JKTypeArgumentListImpl(listOf(JKTypeElementImpl(type)))
)
} else {
JKJavaNewExpressionImpl(
@@ -75,7 +75,7 @@ class ArrayInitializerConversion(private val context: ConversionContext) : Recur
resultType = JKClassTypeImpl(
context.symbolProvider.provideByFqName(KotlinBuiltIns.FQ_NAMES.array.asString()),
listOf(resultType),
Nullability.NotNull
Nullability.Default
)
}
return JKJavaMethodCallExpressionImpl(
@@ -107,7 +107,7 @@ class TypeMappingConversion(val context: ConversionContext) : RecursiveApplicabl
JKClassTypeImpl(
context.symbolProvider.provideByFqName(type.arrayFqName()),
if (type is JKJavaPrimitiveType) emptyList() else listOf(type.mapType(typeElement)),
type.nullability
nullability
)
else -> this
}