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

New J2K: Fix printing no semicolon in enum class

Browse Source
This commit is contained in:
Ilya Kirillov
2018-12-18 15:03:13 +03:00
committed by Ilya Kirillov
parent dcf7895314
commit 17b96b8240
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
+12 -2
View File
@@ -615,8 +615,18 @@ class NewCodeBuilder {
override fun visitClassBody(classBody: JKClassBody) { override fun visitClassBody(classBody: JKClassBody) {
val declarationsToPrint = classBody.declarations.filterNot { it is JKKtPrimaryConstructor } val declarationsToPrint = classBody.declarations.filterNot { it is JKKtPrimaryConstructor }
printer.block(multiline = true) { printer.block(multiline = true) {
renderEnumConstants(declarationsToPrint.filterIsInstance()) val enumConstants = declarationsToPrint.filterIsInstance<JKEnumConstant>()
renderNonEnumClassDeclarations(declarationsToPrint.filterNot { it is JKEnumConstant }) val otherDeclarations = declarationsToPrint.filterNot { it is JKEnumConstant }
renderEnumConstants(enumConstants)
if ((classBody.parent as? JKClass)?.classKind == JKClass.ClassKind.ENUM
&& otherDeclarations.isNotEmpty()
) {
printer.printlnWithNoIndent(";")
}
if (enumConstants.isNotEmpty() && otherDeclarations.isNotEmpty()) {
printer.println()
}
renderNonEnumClassDeclarations(otherDeclarations)
} }
} }