Skip to content

fix: align unicode case folding with String.regionMatches #1302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hanzhe-one wants to merge 3 commits into
base: main
Choose a base branch
from
+25 −2
Open

fix: align unicode case folding with String.regionMatches #1302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfda38f
fix: align unicode case folding with String.regionMatches
hanzhe-one Nov 2, 2026
a7b9077
test: compare unicode region matches against the JDK
hanzhe-one Nov 5, 2026
698fbfc
Merge branch 'main' into fix/unicode-region-matches
alaahong Nov 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions fesod-common/src/main/java/org/apache/fesod/common/util/StringUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,9 @@ public static boolean regionMatches(
}

// The same check as in String.regionMatches():
if (Character.toUpperCase(c1) != Character.toUpperCase(c2)
&& Character.toLowerCase(c1) != Character.toLowerCase(c2)) {
final char upper1 = Character.toUpperCase(c1);
final char upper2 = Character.toUpperCase(c2);
if (upper1 != upper2 && Character.toLowerCase(upper1) != Character.toLowerCase(upper2)) {
return false;
}
}
Expand Down
22 changes: 22 additions & 0 deletions fesod-common/src/test/java/org/apache/fesod/common/util/StringUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,28 @@ boolean invoke() {
}
}

@Test
void test_regionMatches_unicodeIgnoreCase() {
final CharSequence[] dottedI = {"İ", new StringBuilder("İ")};
final CharSequence[] dotlessI = {"ı", new StringBuilder("ı")};
for (final CharSequence source : dottedI) {
for (final CharSequence other : dotlessI) {
Assertions.assertEquals(
source.toString().regionMatches(true, 0, other.toString(), 0, 1),
StringUtils.regionMatches(source, true, 0, other, 0, 1));
Assertions.assertEquals(
other.toString().regionMatches(true, 0, source.toString(), 0, 1),
StringUtils.regionMatches(other, true, 0, source, 0, 1));
Assertions.assertEquals(
source.toString().regionMatches(false, 0, other.toString(), 0, 1),
StringUtils.regionMatches(source, false, 0, other, 0, 1));
Assertions.assertEquals(
other.toString().regionMatches(false, 0, source.toString(), 0, 1),
StringUtils.regionMatches(other, false, 0, source, 0, 1));
}
}
}

@Test
void stripTest() {
Assertions.assertNull(StringUtils.strip(null));
Expand Down