From 17f86d69a7396c1e2825e86335805e371c769149 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Wed, 28 Nov 2018 12:36:28 +0300
Subject: [PATCH] New J2K: Calculate function return type nullability in
 JavaMethodToKotlinFunctionConversion

---
 .../j2k/conversions/JavaMethodToKotlinFunctionConversion.kt  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaMethodToKotlinFunctionConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaMethodToKotlinFunctionConversion.kt
index 9b41c339484..b78b01000c7 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaMethodToKotlinFunctionConversion.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaMethodToKotlinFunctionConversion.kt
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.j2k.ConversionContext
 import org.jetbrains.kotlin.j2k.throwAnnotation
 import org.jetbrains.kotlin.j2k.tree.*
 import org.jetbrains.kotlin.j2k.tree.impl.JKKtFunctionImpl
+import org.jetbrains.kotlin.j2k.tree.impl.JKTypeElementImpl
 
 class JavaMethodToKotlinFunctionConversion(private val context: ConversionContext) : TransformerBasedConversion() {
     override fun visitTreeElement(element: JKTreeElement) {
@@ -34,7 +35,9 @@ class JavaMethodToKotlinFunctionConversion(private val context: ConversionContex
                 declaration.invalidate()
 
                 JKKtFunctionImpl(
-                    declaration.returnType,
+                    JKTypeElementImpl(
+                        declaration.returnType.type.updateNullability(declaration.returnTypeNullability(context))
+                    ),
                     declaration.name,
                     declaration.parameters,
                     declaration.block,