From 5ba3d6bc677c8664a7578a000d676f418930e925 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Sun, 4 Nov 2018 00:41:08 +0300 Subject: [PATCH] New J2K: Fix parameters modifiers --- .../kotlin/j2k/conversions/ModifiersConversion.kt | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ModifiersConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ModifiersConversion.kt index c31c0114de7..3ad1d98166c 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ModifiersConversion.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ModifiersConversion.kt @@ -35,20 +35,7 @@ class ModifiersConversion(private val context: ConversionContext) : RecursiveApp } private fun convertParameterModifiers(jkParameter: JKParameter) { - jkParameter.filterModifiers { - when (it) { - is JKModalityModifier -> it.modality != JKModalityModifier.Modality.OPEN - else -> true - } - } - if (jkParameter.parent is JKKtPrimaryConstructor) { - val hasNonDefaultMutabilityModifier = - jkParameter.modifierList.modifiers.find { - it is JKMutabilityModifier && it.mutability != Mutability.Default - } != null - if (!hasNonDefaultMutabilityModifier) - jkParameter.modifierList.modifiers = emptyList() - } else { + if (jkParameter.modifierList.mutability == Mutability.Default) { jkParameter.modifierList.modifiers = emptyList() } }