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

am 943e91ff: Merge "[SD6] Inline a constant and remove logic become useless" 

* commit '943e91ffbd1edc88bcd815997f8b4d591d02dc7e':
  [SD6] Inline a constant and remove logic become useless
main
Jean Chalard 2014-07-01 05:52:28 +00:00 committed by Android Git Automerger
parent 3ab0124289 943e91ffbd
commit dca55d7c97
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -626,7 +626,6 @@ 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;
@ -639,29 +638,17 @@ public final class RichInputConnection {
return null; return null;
} }
// Going backward, alternate skipping non-separators and separators until enough words // Going backward, find the first breaking point (separator)
// 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 (startIndexInBefore > 0) {
while (true) { // see comments below for why this is guaranteed to halt final int codePoint = Character.codePointBefore(before, startIndexInBefore);
while (startIndexInBefore > 0) { if (isSeparator(codePoint, sortedSeparators)) {
final int codePoint = Character.codePointBefore(before, startIndexInBefore); break;
if (isStoppingAtWhitespace == isSeparator(codePoint, sortedSeparators)) { }
break; // inner loop --startIndexInBefore;
} if (Character.isSupplementaryCodePoint(codePoint)) {
--startIndexInBefore; --startIndexInBefore;
if (Character.isSupplementaryCodePoint(codePoint)) {
--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