IDEA-19061 Integrate the Rearranger-plugin into core-IDEA

Update model rows on changes

platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModelImpl.java

@@ -112,6 +112,10 @@ public class ArrangementRuleEditingModelImpl implements ArrangementRuleEditingMo
     return myRow;
   }
 
+  public void setRow(int row) {
+    myRow = row;
+  }
+
   @NotNull
   public ArrangementTreeNode getTopMost() {
     return myTopMost;

platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java

@@ -508,11 +508,10 @@ public class ArrangementRuleTree {
         ArrangementRuleEditingModelImpl m = myModels.remove(oldRow);
         if (m != null) {
           changedModelMappings.put(newRow, m);
+          m.setRow(newRow);
         }
         return true;
       }
-
-      
     });
     putAll(changedModelMappings, myModels);