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

New J2K: Place else case in the end in switch statement conversion

Browse Source
This commit is contained in:
Ilya Kirillov
2018-11-14 14:22:54 +03:00
committed by Ilya Kirillov
parent 115fe2cb88
commit 3ea1a937c0
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/SwitchStatementConversion.kt
+4 -1
View File
@@ -25,11 +25,14 @@ class SwitchStatementConversion(private val context: ConversionContext) : Recurs
case.label.detach(case) case.label.detach(case)
} }
} }
val cases = switchCasesToWhenCases(element.cases) val cases = switchCasesToWhenCases(element.cases).moveElseCaseToTheEnd()
val whenStatement = JKKtWhenStatementImpl(element.expression, cases) val whenStatement = JKKtWhenStatementImpl(element.expression, cases)
return recurse(whenStatement) return recurse(whenStatement)
} }
private fun List<JKKtWhenCase>.moveElseCaseToTheEnd(): List<JKKtWhenCase> =
sortedBy { it.labels.any { it is JKKtElseWhenLabel } }
private fun switchCasesToWhenCases(cases: List<JKJavaSwitchCase>): List<JKKtWhenCase> = private fun switchCasesToWhenCases(cases: List<JKJavaSwitchCase>): List<JKKtWhenCase> =
if (cases.isEmpty()) emptyList() if (cases.isEmpty()) emptyList()
else { else {