n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clarify some code and fix a bug (A41)

Browse Source 
The test against hasMainDictionary is a test to know if we should
auto-correct or not. Its result should be recorded in
hasAutoCorrection, not in allowsToBeAutoCorrected.

Actually, this value being inserted in allowsToBeAutoCorrected was
causing a bug that nobody noticed: when typing in a language with
no dictionary, the word in the middle of the suggestion strip would
always be bold, as if it was going to auto-correct to itself !
This change fixes this bug.

Change-Id: Ia1f08efd7089b9c5cbede910c5b0951d83e698d2
This commit is contained in:
Jean Chalard 2012-06-28 20:10:19 +09:00
parent 2631e3b195
commit 90d300c770
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
java/src/com/android/inputmethod/latin/Suggest.java
View File

@ -223,24 +223,27 @@ public class Suggest {
// a boolean flag. Right now this is handled with a slight hack in // a boolean flag. Right now this is handled with a slight hack in
// WhitelistDictionary#shouldForciblyAutoCorrectFrom. // WhitelistDictionary#shouldForciblyAutoCorrectFrom.
final boolean allowsToBeAutoCorrected = AutoCorrection.isWhitelistedOrNotAWord( final boolean allowsToBeAutoCorrected = AutoCorrection.isWhitelistedOrNotAWord(
mDictionaries, consideredWord, wordComposer.isFirstCharCapitalized()) mDictionaries, consideredWord, wordComposer.isFirstCharCapitalized());
// If we don't have a main dictionary, we never want to auto-correct. The reason for this
// is, the user may have a contact whose name happens to match a valid word in their
// language, and it will unexpectedly auto-correct. For example, if the user types in
// English with no dictionary and has a "Will" in their contact list, "will" would
// always auto-correct to "Will" which is unwanted. Hence, no main dict => no auto-correct.
&& hasMainDictionary();
final CharSequence whitelistedWord = final CharSequence whitelistedWord =
mWhiteListDictionary.getWhitelistedWord(consideredWord); mWhiteListDictionary.getWhitelistedWord(consideredWord);
final boolean hasAutoCorrection; final boolean hasAutoCorrection;
if (!isCorrectionEnabled || wordComposer.isMostlyCaps() || wordComposer.isResumed()) { if (!isCorrectionEnabled || wordComposer.isMostlyCaps() || wordComposer.isResumed()
|| !hasMainDictionary()) {
// If we don't have a main dictionary, we never want to auto-correct. The reason for
// this is, the user may have a contact whose name happens to match a valid word in
// their language, and it will unexpectedly auto-correct. For example, if the user
// types in English with no dictionary and has a "Will" in their contact list, "will"
// would always auto-correct to "Will" which is unwanted. Hence, no main dict => no
// auto-correct.
hasAutoCorrection = false; hasAutoCorrection = false;
} else if (null != whitelistedWord) { } else if (null != whitelistedWord) {
hasAutoCorrection = true; hasAutoCorrection = true;
} else if (!AutoCorrection.isWhitelistedOrNotAWord(mDictionaries, consideredWord, } else if (!allowsToBeAutoCorrected) {
wordComposer.isFirstCharCapitalized())) { // TODO: make the variable name clearer. If we don't allow auto-correct, that means
// this word is a dictionary word that is not whitelisted, so it should auto-correct
// to itself! Hence, the true here.
hasAutoCorrection = true; hasAutoCorrection = true;
} else if (suggestionsSet.isEmpty()) { } else if (suggestionsSet.isEmpty()) {
hasAutoCorrection = false; hasAutoCorrection = false;