修复kotlin代码排序相同类型元素没有按照字典顺序排序的问题

Author: wuhao000

src/com/wuhao/code/check/PostStart.kt

@@ -87,7 +87,7 @@ class PostStart : StartupActivity {
       if (rule.order == null) {
         StdArrangementMatchRule(createMatcher(rule), BY_NAME)
       } else {
-        StdArrangementMatchRule(createMatcher(rule))
+        StdArrangementMatchRule(createMatcher(rule), rule.order!!)
       }
     }.map {
       ArrangementSectionRule.create(it)

src/com/wuhao/code/check/style/arrangement/KotlinCodeRearrangeProcessor.kt

@@ -89,14 +89,18 @@ class KotlinCodeRearrangeProcessor : Rearranger<ArrangementEntry> {
       when (target.type) {
         FIELD -> when {
           parent != null && parent.type === INTERFACE -> 2
-          previous!!.type == INIT_BLOCK -> 1
+          previous == null -> 1
+          previous.type == INIT_BLOCK -> 1
+          previous.type == FIELD -> 0
           else -> 0
         }
         METHOD -> when {
           parent != null && parent.type === INTERFACE -> 1
+          previous == null -> 1
+          previous.type == FIELD -> 1
           else -> 1
         }
-        CLASS -> 2
+        CLASS -> 1
         INIT_BLOCK -> 1
         else -> -1
       }

src/com/wuhao/code/check/style/arrangement/KotlinElementArrangementEntry.kt

@@ -20,7 +20,11 @@ open class KotlinElementArrangementEntry(parent: ArrangementEntry?,
                                          endOffset: Int,
                                          val type: ArrangementSettingsToken,
                                          private val myName: String?,
-                                         canBeArranged: Boolean) : DefaultArrangementEntry(parent, startOffset, endOffset, canBeArranged), TypeAwareArrangementEntry, NameAwareArrangementEntry, ModifierAwareArrangementEntry {
+                                         canBeArranged: Boolean)
+  : DefaultArrangementEntry(parent, startOffset, endOffset, canBeArranged),
+    TypeAwareArrangementEntry,
+    NameAwareArrangementEntry,
+    ModifierAwareArrangementEntry {
 
   private val myModifiers = ContainerUtilRt.newHashSet<ArrangementSettingsToken>()
   private val myTypes = ContainerUtilRt.newHashSet<ArrangementSettingsToken>()