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 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); } };