From b842052ad20567d46618bdf4e8a81da6f68e2975 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 17 Dec 2009 21:08:36 +0300
Subject: [PATCH] ConfigurablesModifiedTest fixed

---
 .../template/impl/TemplateListPanel.java            | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java
index 77b4f3d931..b4830f4aca 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateListPanel.java
@@ -152,6 +152,10 @@ class TemplateListPanel extends JPanel {
     }
     Collections.sort(result, new Comparator<TemplateImpl>(){
       public int compare(final TemplateImpl o1, final TemplateImpl o2) {
+        final int groupsEqual = o1.getGroupName().compareTo(o2.getGroupName());
+        if (groupsEqual != 0) {
+          return groupsEqual;
+        }
         return o1.getKey().compareTo(o2.getKey());
       }
     });
@@ -166,14 +170,21 @@ class TemplateListPanel extends JPanel {
       newTemplate.parseSegments();
       TemplateImpl originalTemplate = originalGroup.get(i);
       originalTemplate.parseSegments();
-      if (!originalTemplate.equals(newTemplate)) return false;
-      if (originalTemplate.isDeactivated() != newTemplate.isDeactivated()) return false;
-
-      if (!areOptionsEqual(newTemplate, originalTemplate)) return false;
+      if (!originalTemplate.equals(newTemplate)) {
+        return false;
+      }
 
-      if (!areContextsEqual(newTemplate, originalTemplate)) return false;
+      if (originalTemplate.isDeactivated() != newTemplate.isDeactivated()) {
+        return false;
+      }
 
+      if (!areOptionsEqual(newTemplate, originalTemplate)) {
+        return false;
+      }
 
+      if (!areContextsEqual(newTemplate, originalTemplate)) {
+        return false;
+      }
     }
 
     return true;
-- 
2.11.4.GIT