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

New J2K: Fix not converted jetbrains nullability annotations for types

Browse Source 
it became broken after annotation started to be assigned to type elements
instead of declarations after 4da7d11

#KT-34987 fixed
This commit is contained in:
Ilya Kirillov
2019-11-19 20:06:11 +03:00
parent 3840294f44
commit 92f8432b1e
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JetbrainsNullableAnnotationsConverter.kt
+7 -8
View File
@@ -21,14 +21,13 @@ class JetbrainsNullableAnnotationsConverter(context: NewJ2kConverterContext) : R
for (annotation in element.annotationList.annotations) { for (annotation in element.annotationList.annotations) {
val nullability = annotation.annotationNullability() ?: continue val nullability = annotation.annotationNullability() ?: continue
when (element) { when (element) {
is JKVariable -> { is JKVariable -> element.type
annotationsToRemove += annotation is JKMethod -> element.returnType
element.type = JKTypeElement(element.type.type.updateNullability(nullability)) is JKTypeElement -> element
} else -> null
is JKMethod -> { }?.let { typeElement ->
annotationsToRemove += annotation annotationsToRemove += annotation
element.returnType = JKTypeElement(element.returnType.type.updateNullability(nullability)) typeElement.type = typeElement.type.updateNullability(nullability)
}
} }
} }
element.annotationList.annotations -= annotationsToRemove element.annotationList.annotations -= annotationsToRemove