From 5cdc01621d8e5f5183a25ec809019868e51a75fa Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Fri, 11 Jan 2019 15:48:06 +0300 Subject: [PATCH] New J2K: Use parameter initializers as scope for nullability check in LowerNullabilityInFunctionParametersConversion --- .../LowerNullabilityInFunctionParametersConversion.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/LowerNullabilityInFunctionParametersConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/LowerNullabilityInFunctionParametersConversion.kt index bce218a0445..3c52bc5473c 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/LowerNullabilityInFunctionParametersConversion.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/LowerNullabilityInFunctionParametersConversion.kt @@ -18,7 +18,9 @@ class LowerNullabilityInFunctionParametersConversion(private val context: Conver listOfNotNull( element.block, (element as? JKKtConstructor)?.delegationCall - ) + ) + element.parameters.mapNotNull { + if (it.initializer !is JKStubExpression) it.initializer else null + } for (parameter in element.parameters) { if (parameter.type.type.nullability != Nullability.Default) continue if (parameter.hasNotNullUsages(scopes)) {