From 8293da0ceefd2e270fc27241faf387462c606421 Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Thu, 17 Sep 2015 15:36:29 +0300
Subject: [PATCH] resource bundles: sorting (in editor and inspection) use case
 insensitive order now

---
 .../unsorted/AlphaUnsortedPropertiesFileInspection.java       | 4 ++--
 .../editor/ResourceBundlePropertiesUpdateManager.java         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/unsorted/AlphaUnsortedPropertiesFileInspection.java b/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/unsorted/AlphaUnsortedPropertiesFileInspection.java
index ec0a2a582f40..948ce7abb491 100644
--- a/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/unsorted/AlphaUnsortedPropertiesFileInspection.java
+++ b/plugins/properties/properties-psi-impl/src/com/intellij/codeInspection/unsorted/AlphaUnsortedPropertiesFileInspection.java
@@ -125,8 +125,8 @@ public class AlphaUnsortedPropertiesFileInspection extends LocalInspectionTool {
 
     Collections.sort(properties, new Comparator<IProperty>() {
       @Override
-      public int compare(IProperty p1, IProperty p2) {
-        return Comparing.compare(p1.getKey(), p2.getKey());
+      public int compare(@NotNull IProperty p1, @NotNull IProperty p2) {
+        return Comparing.compare(p1.getKey(), p2.getKey(), String.CASE_INSENSITIVE_ORDER);
       }
     });
     final char delimiter = PropertiesCodeStyleSettings.getInstance(file.getProject()).KEY_VALUE_DELIMITER;
diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundlePropertiesUpdateManager.java b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundlePropertiesUpdateManager.java
index 486601448714..bb22b99b1677 100644
--- a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundlePropertiesUpdateManager.java
+++ b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundlePropertiesUpdateManager.java
@@ -164,7 +164,7 @@ public class ResourceBundlePropertiesUpdateManager {
     if (acyclic) {
       if (isEdgesProperlyDirection[0]) {
         final List<String> sortedNodes = new ArrayList<String>(generator.getNodes());
-        Collections.sort(sortedNodes);
+        Collections.sort(sortedNodes, String.CASE_INSENSITIVE_ORDER);
         return Pair.create(sortedNodes, true);
       } else {
         final List<String> dfsNodes = dfstBuilder.getSortedNodes();