From 92f8432b1ef65e8bead9664a1b28f635d3ff577c Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Tue, 19 Nov 2019 20:06:11 +0300 Subject: [PATCH] New J2K: Fix not converted jetbrains nullability annotations for types it became broken after annotation started to be assigned to type elements instead of declarations after 4da7d11 #KT-34987 fixed --- .../JetbrainsNullableAnnotationsConverter.kt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JetbrainsNullableAnnotationsConverter.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JetbrainsNullableAnnotationsConverter.kt index 83460fb4abe..b91d015ec6c 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JetbrainsNullableAnnotationsConverter.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JetbrainsNullableAnnotationsConverter.kt @@ -21,14 +21,13 @@ class JetbrainsNullableAnnotationsConverter(context: NewJ2kConverterContext) : R for (annotation in element.annotationList.annotations) { val nullability = annotation.annotationNullability() ?: continue when (element) { - is JKVariable -> { - annotationsToRemove += annotation - element.type = JKTypeElement(element.type.type.updateNullability(nullability)) - } - is JKMethod -> { - annotationsToRemove += annotation - element.returnType = JKTypeElement(element.returnType.type.updateNullability(nullability)) - } + is JKVariable -> element.type + is JKMethod -> element.returnType + is JKTypeElement -> element + else -> null + }?.let { typeElement -> + annotationsToRemove += annotation + typeElement.type = typeElement.type.updateNullability(nullability) } } element.annotationList.annotations -= annotationsToRemove