am 825e2bbd: Fix a bug when deleting the last char
* commit '825e2bbd910cce3055a4ca808d3744bc0b2cedda': Fix a bug when deleting the last charmain
commit
7876326bf1
|
@ -212,6 +212,7 @@ public class WordComposer {
|
||||||
final int lastPos = size - 1;
|
final int lastPos = size - 1;
|
||||||
char lastChar = mTypedWord.charAt(lastPos);
|
char lastChar = mTypedWord.charAt(lastPos);
|
||||||
mCodes.remove(lastPos);
|
mCodes.remove(lastPos);
|
||||||
|
// TODO: This crashes and catches fire if the code point doesn't fit a char
|
||||||
mTypedWord.deleteCharAt(lastPos);
|
mTypedWord.deleteCharAt(lastPos);
|
||||||
if (Character.isUpperCase(lastChar)) mCapsCount--;
|
if (Character.isUpperCase(lastChar)) mCapsCount--;
|
||||||
}
|
}
|
||||||
|
@ -221,8 +222,9 @@ public class WordComposer {
|
||||||
if (mTrailingSingleQuotesCount > 0) {
|
if (mTrailingSingleQuotesCount > 0) {
|
||||||
--mTrailingSingleQuotesCount;
|
--mTrailingSingleQuotesCount;
|
||||||
} else {
|
} else {
|
||||||
for (int i = mTypedWord.offsetByCodePoints(mTypedWord.length(), -1);
|
int i = mTypedWord.length();
|
||||||
i >= 0; i = mTypedWord.offsetByCodePoints(i, -1)) {
|
while (i > 0) {
|
||||||
|
i = mTypedWord.offsetByCodePoints(i, -1);
|
||||||
if (Keyboard.CODE_SINGLE_QUOTE != mTypedWord.codePointAt(i)) break;
|
if (Keyboard.CODE_SINGLE_QUOTE != mTypedWord.codePointAt(i)) break;
|
||||||
++mTrailingSingleQuotesCount;
|
++mTrailingSingleQuotesCount;
|
||||||
}
|
}
|
||||||
|
|
|
@ -291,4 +291,13 @@ public class InputLogicTests extends ServiceTestCase<LatinIME> {
|
||||||
assertEquals("manual pick then space then type", WORD1_TO_TYPE + WORD2_TO_TYPE,
|
assertEquals("manual pick then space then type", WORD1_TO_TYPE + WORD2_TO_TYPE,
|
||||||
mTextView.getText().toString());
|
mTextView.getText().toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void testDeleteWholeComposingWord() {
|
||||||
|
final String WORD_TO_TYPE = "this";
|
||||||
|
type(WORD_TO_TYPE);
|
||||||
|
for (int i = 0; i < WORD_TO_TYPE.length(); ++i) {
|
||||||
|
type(Keyboard.CODE_DELETE);
|
||||||
|
}
|
||||||
|
assertEquals("delete whole composing word", "", mTextView.getText().toString());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue