From f6b9c01db6e852412345c63dc1515ecc7218a8ab Mon Sep 17 00:00:00 2001
From: "Denis.Zhdanov" <denzhdanov@gmail.com>
Date: Wed, 22 Aug 2012 15:41:11 +0400
Subject: [PATCH] IDEA-19061 Integrate the Rearranger-plugin into core-IDE

Correct selection setup on multi row tree change during rule condition change
---
 .../arrangement/ArrangementRuleTree.java      | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java
index 39580690cae2..53c212ccb33b 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java
@@ -60,7 +60,8 @@ public class ArrangementRuleTree {
   @NotNull private final DefaultTreeModel                myTreeModel;
   @NotNull private final Tree                            myTree;
   @NotNull private final ArrangementNodeComponentFactory myFactory;
-
+  
+  private boolean myExplicitSelectionChange;
   private boolean mySkipSelectionChange;
 
   public ArrangementRuleTree(@NotNull ArrangementSettingsGrouper grouper, @NotNull ArrangementNodeDisplayManager displayManager) {
@@ -102,8 +103,16 @@ public class ArrangementRuleTree {
     mySelectionModel.addTreeSelectionListener(new TreeSelectionListener() {
       @Override
       public void valueChanged(TreeSelectionEvent e) {
-        setSelection(e.getOldLeadSelectionPath(), false);
-        setSelection(e.getNewLeadSelectionPath(), true);
+        if (myExplicitSelectionChange) {
+          return;
+        }
+        TreePath[] paths = e.getPaths();
+        if (paths == null) {
+          return;
+        }
+        for (int i = 0; i < paths.length; i++) {
+          setSelection(paths[i], e.isAddedPath(i));
+        }
       }
     });
     myTree.addMouseListener(new MouseAdapter() {
@@ -299,7 +308,7 @@ public class ArrangementRuleTree {
   private void onModelChange(@NotNull ArrangementTreeNode topMost, @NotNull ArrangementTreeNode bottomMost) {
     expandAll(myTree, new TreePath(topMost.getPath()));
     mySelectionModel.clearSelection();
-    //mySkipSelectionChange = true;
+    myExplicitSelectionChange = true;
     try {
       for (ArrangementTreeNode node = bottomMost; node != null; node = node.getParent()) {
         TreePath path = new TreePath(node.getPath());
@@ -317,7 +326,7 @@ public class ArrangementRuleTree {
       }
     }
     finally {
-      mySkipSelectionChange = false;
+      myExplicitSelectionChange = false;
     }
   }