mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
WEB-9926 don't auto expand library scope, we must use case-sensitive natural compare — constants must be first
This commit is contained in:
@@ -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) {
|
||||
|
||||
+1
-1
@@ -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);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user