From 2a5824a63b244d1e5b18e512bc8dfb34f795f579 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Fri, 27 Jun 2014 22:01:51 +0900
Subject: [PATCH] [SD6] Inline a constant and remove logic become useless
Bug: 15840116
Change-Id: I04b9d6bd45d9e806c268fa8ecb4653f8af729095
---
.../latin/RichInputConnection.java | 29 +++++--------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/java/src/com/android/inputmethod/latin/RichInputConnection.java b/java/src/com/android/inputmethod/latin/RichInputConnection.java
index 96bf17b5c3..5e0dafa577 100644
--- a/java/src/com/android/inputmethod/latin/RichInputConnection.java
+++ b/java/src/com/android/inputmethod/latin/RichInputConnection.java
@@ -626,7 +626,6 @@ public final class RichInputConnection {
* @return a range containing the text surrounding the cursor
*/
public TextRange getWordRangeAtCursor(final int[] sortedSeparators) {
- final int additionalPrecedingWordsCount = 0;
mIC = mParent.getCurrentInputConnection();
if (mIC == null) {
return null;
@@ -639,29 +638,17 @@ public final class RichInputConnection {
return null;
}
- // Going backward, alternate skipping non-separators and separators until enough words
- // have been read.
- int count = additionalPrecedingWordsCount;
+ // Going backward, find the first breaking point (separator)
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) {
- final int codePoint = Character.codePointBefore(before, startIndexInBefore);
- if (isStoppingAtWhitespace == isSeparator(codePoint, sortedSeparators)) {
- break; // inner loop
- }
- --startIndexInBefore;
- if (Character.isSupplementaryCodePoint(codePoint)) {
- --startIndexInBefore;
- }
+ while (startIndexInBefore > 0) {
+ final int codePoint = Character.codePointBefore(before, startIndexInBefore);
+ if (isSeparator(codePoint, sortedSeparators)) {
+ break;
}
- // 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
+ --startIndexInBefore;
+ if (Character.isSupplementaryCodePoint(codePoint)) {
+ --startIndexInBefore;
}
- isStoppingAtWhitespace = !isStoppingAtWhitespace;
}
// Find last word separator after the cursor
--
GitLab