Minor: Clarify code for KT-18786: Fix J2K to move properties to top

This commit is contained in:
Simon Ogorodnik
2017-07-20 16:04:07 +03:00
parent 9213c4a1ab
commit 8f78446bff
@@ -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<Member> {
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
}
}
}