diff --git a/j2k/src/org/jetbrains/kotlin/j2k/AnnotationConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/AnnotationConverter.kt index 04d401244d8..3ce3f5a6491 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/AnnotationConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/AnnotationConverter.kt @@ -32,7 +32,7 @@ class AnnotationConverter(private val converter: Converter) { + NullableNotNullManager.getInstance(converter.project).getNullables() + listOf(CommonClassNames.JAVA_LANG_OVERRIDE, javaClass().name)).toSet() - public fun isImportRequired(annotationName: String): Boolean { + public fun isImportNotRequired(annotationName: String): Boolean { return annotationName in annotationsToRemove || annotationName == javaClass().name } diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt index 17859200a8e..dbe70833dc8 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt @@ -65,7 +65,7 @@ public fun Converter.convertImport(anImport: PsiImportStatementBase, filter: Boo } private fun Converter.filterImport(name: String, ref: PsiJavaCodeReferenceElement): String? { - if (annotationConverter.isImportRequired(name)) return null + if (annotationConverter.isImportNotRequired(name)) return null // If imported class has a kotlin analog, drop the import if (!JavaToKotlinClassMap.INSTANCE.mapPlatformClass(FqName(name)).isEmpty()) return null