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

[CB18] Move some code around 

Bring next to each other two methods scheduled for a merge

Bug: 13406701
Change-Id: I335c7202cc07d8865f4ab92e4023c1d93d1f83ac
main
Jean Chalard 2014-03-25 22:41:23 +09:00
parent 3285b68c97
commit 8bb2e99aef
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
java/src/com/android/inputmethod/latin/WordComposer.java
View File

@ -200,6 +200,33 @@ public final class WordComposer {
mAutoCorrection = null;
}
/**
* Delete the last composing unit as a result of hitting backspace.
*/
public void deleteLast(final Event event) {
mCombinerChain.processEvent(mEvents, event);
mEvents.add(event);
refreshTypedWordCache();
// We may have deleted the last one.
if (0 == size()) {
mIsFirstCharCapitalized = false;
}
if (mTrailingSingleQuotesCount > 0) {
--mTrailingSingleQuotesCount;
} else {
int i = mTypedWordCache.length();
while (i > 0) {
i = Character.offsetByCodePoints(mTypedWordCache, i, -1);
if (Constants.CODE_SINGLE_QUOTE != Character.codePointAt(mTypedWordCache, i)) {
break;
}
++mTrailingSingleQuotesCount;
}
}
mCursorPositionWithinWord = mCodePointSize;
mAutoCorrection = null;
}
public void setCursorPositionWithinWord(final int posWithinWord) {
mCursorPositionWithinWord = posWithinWord;
// TODO: compute where that puts us inside the events
@ -296,33 +323,6 @@ public final class WordComposer {
mPreviousWordForSuggestion = null == previousWord ? null : previousWord.toString();
}
/**
* Delete the last composing unit as a result of hitting backspace.
*/
public void deleteLast(final Event event) {
mCombinerChain.processEvent(mEvents, event);
mEvents.add(event);
refreshTypedWordCache();
// We may have deleted the last one.
if (0 == size()) {
mIsFirstCharCapitalized = false;
}
if (mTrailingSingleQuotesCount > 0) {
--mTrailingSingleQuotesCount;
} else {
int i = mTypedWordCache.length();
while (i > 0) {
i = Character.offsetByCodePoints(mTypedWordCache, i, -1);
if (Constants.CODE_SINGLE_QUOTE != Character.codePointAt(mTypedWordCache, i)) {
break;
}
++mTrailingSingleQuotesCount;
}
}
mCursorPositionWithinWord = mCodePointSize;
mAutoCorrection = null;
}
/**
* Returns the word as it was typed, without any correction applied.
* @return the word that was typed so far. Never returns null.