diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/ClassBody.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/ClassBody.kt index 6dfc5c6fbeb..6de71150fb6 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/ClassBody.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/ClassBody.kt @@ -39,7 +39,7 @@ class ClassBody( builder append " " append lBrace append "\n" if (!classKind.isEnum()) { - builder.append(membersFiltered.sortedWith(PropertyComparator), "\n") + builder.append(membersFiltered.sortedByDescending { it is Property }, "\n") } else { val (constants, otherMembers) = membersFiltered.partition { it is EnumConstant } @@ -50,7 +50,7 @@ class ClassBody( builder.append(";\n") } - builder.append(otherMembers.sortedWith(PropertyComparator), "\n") + builder.append(otherMembers.sortedByDescending { it is Property }, "\n") } appendCompanionObject(builder, membersFiltered.isNotEmpty()) @@ -63,13 +63,4 @@ class ClassBody( if (blankLineBefore) builder.append("\n\n") builder.append(companionObjectMembers, "\n", "companion object {\n", "\n}") } -} - -private object PropertyComparator : Comparator { - override fun compare(o1: Member?, o2: Member?): Int = when { - o1 is Property && o2 is Property -> 0 - o1 is Property -> -1 - o2 is Property -> 1 - else -> 0 - } -} +} \ No newline at end of file