From 5ef006cce753cfa65df1fe0164bfbb7c4ba12444 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Mon, 24 Feb 2014 15:49:15 +0100
Subject: [PATCH] =?UTF-8?q?WEB-9926=20don't=20auto=20expand=20library=20sc?=
 =?UTF-8?q?ope,=20we=20must=20use=20case-sensitive=20natural=20compare=20?=
 =?UTF-8?q?=E2=80=94=20constants=20must=20be=20first?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../util/src/com/intellij/openapi/util/text/StringUtil.java   | 4 ++--
 .../intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
index f54897eb4282..552763fcfb85 100644
--- a/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/text/StringUtil.java
@@ -2286,7 +2286,7 @@ public class StringUtil extends StringUtilRt {
     return naturalCompare(string1, string2, false);
   }
 
-  private static int naturalCompare(@Nullable String string1, @Nullable String string2, boolean caseSensitive) {
+  public static int naturalCompare(@Nullable String string1, @Nullable String string2, boolean caseSensitive) {
     //noinspection StringEquality
     if (string1 == string2) {
       return 0;
@@ -2635,7 +2635,7 @@ public class StringUtil extends StringUtilRt {
    * i.e. when java.util.regex.Pattern match goes out of control.
    */
   public abstract static class BombedCharSequence implements CharSequence {
-    private CharSequence delegate;
+    private final CharSequence delegate;
     private int i = 0;
 
     public BombedCharSequence(@NotNull CharSequence sequence) {
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java
index 8b679f120739..2f48f369ee29 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/XValueNodeImpl.java
@@ -44,7 +44,7 @@ public class XValueNodeImpl extends XValueContainerNode<XValue> implements XValu
     @Override
     public int compare(XValueNodeImpl o1, XValueNodeImpl o2) {
       //noinspection ConstantConditions
-      return StringUtil.naturalCompare(o1.getName(), o2.getName());
+      return StringUtil.naturalCompare(o1.getName(), o2.getName(), true);
     }
   };