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

New J2K: Calculate function return type nullability in JavaMethodToKotlinFunctionConversion

Browse Source
This commit is contained in:
Ilya Kirillov
2018-11-28 12:36:28 +03:00
committed by Ilya Kirillov
parent b076e7e881
commit 17f86d69a7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/JavaMethodToKotlinFunctionConversion.kt
+4 -1
View File
@@ -20,6 +20,7 @@ import org.jetbrains.kotlin.j2k.ConversionContext
import org.jetbrains.kotlin.j2k.throwAnnotation import org.jetbrains.kotlin.j2k.throwAnnotation
import org.jetbrains.kotlin.j2k.tree.* import org.jetbrains.kotlin.j2k.tree.*
import org.jetbrains.kotlin.j2k.tree.impl.JKKtFunctionImpl import org.jetbrains.kotlin.j2k.tree.impl.JKKtFunctionImpl
import org.jetbrains.kotlin.j2k.tree.impl.JKTypeElementImpl
class JavaMethodToKotlinFunctionConversion(private val context: ConversionContext) : TransformerBasedConversion() { class JavaMethodToKotlinFunctionConversion(private val context: ConversionContext) : TransformerBasedConversion() {
override fun visitTreeElement(element: JKTreeElement) { override fun visitTreeElement(element: JKTreeElement) {
@@ -34,7 +35,9 @@ class JavaMethodToKotlinFunctionConversion(private val context: ConversionContex
declaration.invalidate() declaration.invalidate()
JKKtFunctionImpl( JKKtFunctionImpl(
declaration.returnType, JKTypeElementImpl(
declaration.returnType.type.updateNullability(declaration.returnTypeNullability(context))
),
declaration.name, declaration.name,
declaration.parameters, declaration.parameters,
declaration.block, declaration.block,