From 841cd9c74968b06e421759dc9b9760918a3b3c19 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Mon, 24 Dec 2018 12:12:43 +0300
Subject: [PATCH] New J2K: Do not remove redundant nullability in post
 precessing for variable if initializer is nullable

---
 .../org/jetbrains/kotlin/idea/j2k/NewJ2kPostProcessings.kt    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/NewJ2kPostProcessings.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/NewJ2kPostProcessings.kt
index 95d15e2762b..f811d4d0db1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/j2k/NewJ2kPostProcessings.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/j2k/NewJ2kPostProcessings.kt
@@ -406,6 +406,10 @@ object NewJ2KPostProcessingRegistrarImpl : J2KPostProcessingRegistrar {
                 if (!element.isLocal) return false
                 val typeReference = element.typeReference
                 if (typeReference == null || typeReference.typeElement !is KtNullableType) return false
+                val initializerType = element.initializer?.let {
+                    it.analyzeInContext(element.getResolutionScope()).getType(it)
+                }
+                if (initializerType?.isNullable() == true) return false
 
                 return ReferencesSearch.search(element, element.useScope).findAll().mapNotNull { ref ->
                     val parent = (ref.element.parent as? KtExpression)?.asAssignment()