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

Reduction, step 3

Browse source 
Change-Id: I0e08b102c9539d97c473505b9d42176c4a7c8853
This commit is contained in:
Jean Chalard 2012-03-09 18:13:48 +09:00
parent 8abd15b59f
commit 5a61d03f31
1 changed files with 7 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
java/src/com/android/inputmethod/latin/Suggest.java
View file

@ -300,33 +300,14 @@ public class Suggest implements Dictionary.WordCallback {
for (final Dictionary dictionary : mBigramDictionaries.values()) { for (final Dictionary dictionary : mBigramDictionaries.values()) {
dictionary.getBigrams(wordComposer, prevWordForBigram, this); dictionary.getBigrams(wordComposer, prevWordForBigram, this);
} }
if (true) { // Nothing entered: return all bigrams for the previous word
// Nothing entered: return all bigrams for the previous word int insertCount = Math.min(mBigramSuggestions.size(), mPrefMaxSuggestions);
int insertCount = Math.min(mBigramSuggestions.size(), mPrefMaxSuggestions); for (int i = 0; i < insertCount; ++i) {
for (int i = 0; i < insertCount; ++i) { addBigramToSuggestions(mBigramSuggestions.get(i));
addBigramToSuggestions(mBigramSuggestions.get(i));
}
} else {
// Word entered: return only bigrams that match the first char of the typed word
final char currentChar = consideredWord.charAt(0);
// TODO: Must pay attention to locale when changing case.
final char currentCharUpper = Character.toUpperCase(currentChar);
int count = 0;
final int bigramSuggestionSize = mBigramSuggestions.size();
for (int i = 0; i < bigramSuggestionSize; i++) {
final CharSequence bigramSuggestion = mBigramSuggestions.get(i);
final char bigramSuggestionFirstChar = bigramSuggestion.charAt(0);
if (bigramSuggestionFirstChar == currentChar
|| bigramSuggestionFirstChar == currentCharUpper) {
addBigramToSuggestions(bigramSuggestion);
if (++count > mPrefMaxSuggestions) break;
}
}
} }
} }
} }
CharSequence whitelistedWord = capitalizeWord(mIsAllUpperCase, mIsFirstCharCapitalized, CharSequence whitelistedWord = null;
null);
final boolean hasAutoCorrection; final boolean hasAutoCorrection;
if (CORRECTION_FULL == correctionMode if (CORRECTION_FULL == correctionMode
@ -337,18 +318,8 @@ public class Suggest implements Dictionary.WordCallback {
hasAutoCorrection = false; hasAutoCorrection = false;
} }
if (whitelistedWord != null) { // TODO: SuggestedWords.Builder#addWord will not insert any isEmpty() word, so the
if (mTrailingSingleQuotesCount > 0) { // following is useless
final StringBuilder sb = new StringBuilder(whitelistedWord);
for (int i = mTrailingSingleQuotesCount - 1; i >= 0; --i) {
sb.appendCodePoint(Keyboard.CODE_SINGLE_QUOTE);
}
mSuggestions.add(0, sb.toString());
} else {
mSuggestions.add(0, whitelistedWord);
}
}
mSuggestions.add(0, typedWord); mSuggestions.add(0, typedWord);
StringUtils.removeDupes(mSuggestions); StringUtils.removeDupes(mSuggestions);