From 30590071e44dc4918888870a6e41672a10ef45eb Mon Sep 17 00:00:00 2001
From: Anna Kozlova <Anna.Kozlova@jetbrains.com>
Date: Wed, 24 Jun 2009 16:02:18 +0400
Subject: [PATCH] merge order with current severities

---
 .../com/intellij/codeInsight/daemon/impl/SeverityRegistrar.java  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lang-impl/src/com/intellij/codeInsight/daemon/impl/SeverityRegistrar.java b/lang-impl/src/com/intellij/codeInsight/daemon/impl/SeverityRegistrar.java
index 2d248d5366..9ff0e166ee 100644
--- a/lang-impl/src/com/intellij/codeInsight/daemon/impl/SeverityRegistrar.java
+++ b/lang-impl/src/com/intellij/codeInsight/daemon/impl/SeverityRegistrar.java
@@ -146,8 +146,13 @@ public class SeverityRegistrar implements JDOMExternalizable, Comparator<Highlig
     }
     myOrder.clear();
     myOrder.readExternal(element);
-    for (String stdSeverity : STANDART_SEVERITIES.keySet()) {
-      if (!myOrder.contains(stdSeverity)) { //todo order
+
+    final Set<String> knownSeverities = new HashSet<String>(ourMap.keySet()); //remove all irrelevant
+    knownSeverities.addAll(STANDART_SEVERITIES.keySet());
+    myOrder.retainAll(knownSeverities);
+
+    for (String stdSeverity : knownSeverities) { //enforce include all known
+      if (!myOrder.contains(stdSeverity)) {
         myOrder.add(0, stdSeverity);
       }
     }
-- 
2.11.4.GIT