Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LANG-1300: fixed CharSequenceUtils indexOf for Supplementary chars

This commit is contained in:
MarkDacek 2017-03-08 22:58:51 -05:00
parent 66f8569ecc
commit 12e597a78c
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/apache/commons/lang3/CharSequenceUtils.java
View File

@ -84,16 +84,18 @@ public class CharSequenceUtils {
} }
//supplementary characters (LANG1300) //supplementary characters (LANG1300)
if (searchChar <= Character.MAX_CODE_POINT) { if (searchChar <= Character.MAX_CODE_POINT) {
int ind = 0;
char[] chars = Character.toChars(searchChar); char[] chars = Character.toChars(searchChar);
for (int i = start; i < sz; i++) { for (int i = start; i < sz - 1; i++) {
if (cs.charAt(i) == chars[0]) { char high = cs.charAt(i);
if (i + 1 == sz) { char low = cs.charAt(i + 1);
break; if (high == chars[0] && low == chars[1]) {
} return ind;
if (cs.charAt(i + 1) == chars[1]) { } else if (Character.isSurrogatePair(high, low)) {
return i; //skip over 1
} i++;
} }
ind++;
} }
} }
return NOT_FOUND; return NOT_FOUND;
@ -148,6 +150,7 @@ public class CharSequenceUtils {
} }
} }
//supplementary characters (LANG1300) //supplementary characters (LANG1300)
//NOTE - we must do a forward traversal for this to avoid duplicating code points
if (searchChar <= Character.MAX_CODE_POINT) { if (searchChar <= Character.MAX_CODE_POINT) {
char[] chars = Character.toChars(searchChar); char[] chars = Character.toChars(searchChar);
for (int i = start; i >= 0; --i) { for (int i = start; i >= 0; --i) {

2
src/test/java/org/apache/commons/lang3/StringUtilsEqualsIndexOfTest.java
View File

@ -300,6 +300,8 @@ public class StringUtilsEqualsIndexOfTest {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.appendCodePoint(CODE_POINT); builder.appendCodePoint(CODE_POINT);
assertEquals(0, StringUtils.indexOf(builder, CODE_POINT, 0)); assertEquals(0, StringUtils.indexOf(builder, CODE_POINT, 0));
builder.appendCodePoint(CODE_POINT);
assertEquals(1, StringUtils.indexOf(builder, CODE_POINT, 1));
//inner branch on the supplementary character block //inner branch on the supplementary character block
char[] tmp = {(char) 55361}; char[] tmp = {(char) 55361};
builder = new StringBuilder(); builder = new StringBuilder();