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

New J2K: Fix parameters modifiers

Browse Source
This commit is contained in:
Ilya Kirillov
2018-11-04 00:41:08 +03:00
committed by Ilya Kirillov
parent 9e98e36ac7
commit 5ba3d6bc67
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ModifiersConversion.kt
+1 -14
View File
@@ -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()
}
}