Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix whitespace removal bug"

Browse Source
This commit is contained in:
Justin Ghan
2022-10-05 16:12:13 +00:00
committed by Android (Google) Code Review
parent 9557e80098 83162821c7
commit afd1ca4af9
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/java/android/widget/TextView.java
View File

@@ -9358,10 +9358,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// - The deleted text is at the end of the text
// e.g. "one [deleted]" -> "one |" -> "one|"
// (The pipe | indicates the cursor position.)
while (start > 0 && TextUtils.isWhitespaceExceptNewline(codePointBeforeStart)) {
do {
start -= Character.charCount(codePointBeforeStart);
if (start == 0) break;
codePointBeforeStart = Character.codePointBefore(mText, start);
}
} while (TextUtils.isWhitespaceExceptNewline(codePointBeforeStart));
} else if (TextUtils.isWhitespaceExceptNewline(codePointAtEnd)
&& (TextUtils.isWhitespace(codePointBeforeStart)
|| TextUtils.isPunctuation(codePointBeforeStart))) {
@@ -9373,11 +9374,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// - The deleted text is at the start of the text
// e.g. "[deleted] two" -> "| two" -> "|two"
// (The pipe | indicates the cursor position.)
while (end < mText.length()
&& TextUtils.isWhitespaceExceptNewline(codePointAtEnd)) {
do {
end += Character.charCount(codePointAtEnd);
if (end == mText.length()) break;
codePointAtEnd = Character.codePointAt(mText, end);
}
} while (TextUtils.isWhitespaceExceptNewline(codePointAtEnd));
}
}
@@ -9487,11 +9488,19 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
int endOffset = startOffset;
while (startOffset > 0 && Character.isWhitespace(mText.charAt(startOffset - 1))) {
startOffset--;
while (startOffset > 0) {
int codePointBeforeStart = Character.codePointBefore(mText, startOffset);
if (!TextUtils.isWhitespace(codePointBeforeStart)) {
break;
}
startOffset -= Character.charCount(codePointBeforeStart);
}
while (endOffset < mText.length() && Character.isWhitespace(mText.charAt(endOffset))) {
endOffset++;
while (endOffset < mText.length()) {
int codePointAtEnd = Character.codePointAt(mText, endOffset);
if (!TextUtils.isWhitespace(codePointAtEnd)) {
break;
}
endOffset += Character.charCount(codePointAtEnd);
}
if (startOffset < endOffset) {
getEditableText().delete(startOffset, endOffset);