Skip to content

Use Character.charCount. #8167

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

Merged
copybara-service merged 1 commit into from
Jan 24, 2026
+6 −4
Merged

Use Character.charCount. #8167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 android/guava/src/com/google/common/escape/UnicodeEscaper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package com.google.common.escape;

import static com.google.common.base.Preconditions.checkNotNull;
import static java.lang.Character.charCount;

import com.google.common.annotations.GwtCompatible;
import org.jspecify.annotations.Nullable;
Expand Down Expand Up @@ -134,7 +135,7 @@ protected int nextEscapeIndex(CharSequence csq, int start, int end) {
if (cp < 0 || escape(cp) != null) {
break;
}
index += Character.isSupplementaryCodePoint(cp) ? 2 : 1;
index += charCount(cp);
}
return index;
}
Expand Down Expand Up @@ -171,7 +172,7 @@ protected final String escapeSlow(String s, int index) {
// (for performance reasons) yield some false positives but it must never
// give false negatives.
char[] escaped = escape(cp);
int nextIndex = index + (Character.isSupplementaryCodePoint(cp) ? 2 : 1);
int nextIndex = index + charCount(cp);
if (escaped != null) {
int charsSkipped = index - unescapedChunkStart;

Expand Down
5 changes: 3 additions & 2 deletions guava/src/com/google/common/escape/UnicodeEscaper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package com.google.common.escape;

import static com.google.common.base.Preconditions.checkNotNull;
import static java.lang.Character.charCount;

import com.google.common.annotations.GwtCompatible;
import org.jspecify.annotations.Nullable;
Expand Down Expand Up @@ -134,7 +135,7 @@ protected int nextEscapeIndex(CharSequence csq, int start, int end) {
if (cp < 0 || escape(cp) != null) {
break;
}
index += Character.isSupplementaryCodePoint(cp) ? 2 : 1;
index += charCount(cp);
}
return index;
}
Expand Down Expand Up @@ -171,7 +172,7 @@ protected final String escapeSlow(String s, int index) {
// (for performance reasons) yield some false positives but it must never
// give false negatives.
char[] escaped = escape(cp);
int nextIndex = index + (Character.isSupplementaryCodePoint(cp) ? 2 : 1);
int nextIndex = index + charCount(cp);
if (escaped != null) {
int charsSkipped = index - unescapedChunkStart;

Expand Down
Loading