nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Revert "[SD6] Inline a constant and remove logic become useless""

main
Ken Wakasa 2014-07-01 03:22:52 +00:00 committed by Android (Google) Code Review
parent c8094c463b f84573c0b3
commit 35605db9a4
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
java/src/com/android/inputmethod/latin/RichInputConnection.java
View File

@ -626,6 +626,7 @@ public final class RichInputConnection {
* @return a range containing the text surrounding the cursor * @return a range containing the text surrounding the cursor
*/ */
public TextRange getWordRangeAtCursor(final int[] sortedSeparators) { public TextRange getWordRangeAtCursor(final int[] sortedSeparators) {
final int additionalPrecedingWordsCount = 0;
mIC = mParent.getCurrentInputConnection(); mIC = mParent.getCurrentInputConnection();
if (mIC == null) { if (mIC == null) {
return null; return null;
@ -638,18 +639,30 @@ public final class RichInputConnection {
return null; return null;
} }
// Going backward, find the first breaking point (separator) // Going backward, alternate skipping non-separators and separators until enough words
// have been read.
int count = additionalPrecedingWordsCount;
int startIndexInBefore = before.length(); int startIndexInBefore = before.length();
boolean isStoppingAtWhitespace = true; // toggles to indicate what to stop at
while (true) { // see comments below for why this is guaranteed to halt
while (startIndexInBefore > 0) { while (startIndexInBefore > 0) {
final int codePoint = Character.codePointBefore(before, startIndexInBefore); final int codePoint = Character.codePointBefore(before, startIndexInBefore);
if (isSeparator(codePoint, sortedSeparators)) { if (isStoppingAtWhitespace == isSeparator(codePoint, sortedSeparators)) {
break; break; // inner loop
} }
--startIndexInBefore; --startIndexInBefore;
if (Character.isSupplementaryCodePoint(codePoint)) { if (Character.isSupplementaryCodePoint(codePoint)) {
--startIndexInBefore; --startIndexInBefore;
} }
} }
// isStoppingAtWhitespace is true every other time through the loop,
// so additionalPrecedingWordsCount is guaranteed to become < 0, which
// guarantees outer loop termination
if (isStoppingAtWhitespace && (--count < 0)) {
break; // outer loop
}
isStoppingAtWhitespace = !isStoppingAtWhitespace;
}
// Find last word separator after the cursor // Find last word separator after the cursor
int endIndexInAfter = -1; int endIndexInAfter = -1;