am 58eed636: Merge "Stop considering personalization dicts outputs as words"

* commit '58eed6360db7f8d2ba12ab34d18656f8ec7b6116':
  Stop considering personalization dicts outputs as words

4 files changed, 30 insertions, 6 deletions

diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
index 565d6a1f9..48a6588a2 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -750,7 +750,7 @@ abstract public class ExpandableBinaryDictionary extends Dictionary {
 
     // TODO: Implement BinaryDictionary.isInDictionary().
     @UsedForTesting
-    public boolean isInDictionaryForTests(final String word) {
+    public boolean isInUnderlyingBinaryDictionaryForTests(final String word) {
         final AsyncResultHolder<Boolean> holder = new AsyncResultHolder<Boolean>();
         getExecutor(mDictName).executePrioritized(new Runnable() {
             @Override
diff --git a/java/src/com/android/inputmethod/latin/Suggest.java b/java/src/com/android/inputmethod/latin/Suggest.java
index 439c8562e..bb938a99e 100644
--- a/java/src/com/android/inputmethod/latin/Suggest.java
+++ b/java/src/com/android/inputmethod/latin/Suggest.java
@@ -127,21 +127,33 @@ public final class Suggest {
         mDictionaryFacilitator.getSuggestions(wordComposerForLookup, prevWordForBigram,
                 proximityInfo, blockOffensiveWords, additionalFeaturesOptions, SESSION_TYPING,
                 suggestionsSet);
+        final String firstSuggestion;
         final String whitelistedWord;
         if (suggestionsSet.isEmpty()) {
-            whitelistedWord = null;
-        } else if (SuggestedWordInfo.KIND_WHITELIST != suggestionsSet.first().mKind) {
-            whitelistedWord = null;
+            whitelistedWord = firstSuggestion = null;
         } else {
-            whitelistedWord = suggestionsSet.first().mWord;
+            final SuggestedWordInfo firstSuggestedWordInfo = suggestionsSet.first();
+            firstSuggestion = firstSuggestedWordInfo.mWord;
+            if (SuggestedWordInfo.KIND_WHITELIST != firstSuggestedWordInfo.mKind) {
+                whitelistedWord = null;
+            } else {
+                whitelistedWord = firstSuggestion;
+            }
         }
 
         // The word can be auto-corrected if it has a whitelist entry that is not itself,
         // or if it's a 2+ characters non-word (i.e. it's not in the dictionary).
+        // We allow auto-correction if we have a whitelisted word, or if the word is not a valid
+        // word of more than 1 char, except if the first suggestion is the same as the typed string
+        // because in this case if it's strong enough to auto-correct that will mistakenly designate
+        // the second candidate for auto-correction.
+        // TODO: stop relying on indices to find where is the auto-correction in the suggested
+        // words, and correct this test.
         final boolean allowsToBeAutoCorrected = (null != whitelistedWord
                 && !whitelistedWord.equals(consideredWord))
                 || (consideredWord.length() > 1 && !mDictionaryFacilitator.isValidWord(
-                        consideredWord, wordComposer.isFirstCharCapitalized()));
+                        consideredWord, wordComposer.isFirstCharCapitalized())
+                        && !consideredWord.equals(firstSuggestion));
 
         final boolean hasAutoCorrection;
         // TODO: using isCorrectionEnabled here is not very good. It's probably useless, because
diff --git a/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionary.java b/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionary.java
index 7c9b2a169..652614876 100644
--- a/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionary.java
+++ b/java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionary.java
@@ -39,4 +39,10 @@ public class PersonalizationDictionary extends DecayingExpandableBinaryDictionar
         super(context, locale, Dictionary.TYPE_PERSONALIZATION, getDictNameWithLocale(NAME, locale),
                 dictFile);
     }
+
+    @Override
+    public boolean isValidWord(final String word) {
+        // Strings out of this dictionary should not be considered existing words.
+        return false;
+    }
 }
diff --git a/java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java b/java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java
index c23bc9bc0..6778c2334 100644
--- a/java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/personalization/UserHistoryDictionary.java
@@ -45,4 +45,10 @@ public class UserHistoryDictionary extends DecayingExpandableBinaryDictionaryBas
     public void cancelAddingUserHistory(final String word0, final String word1) {
         removeBigramDynamically(word0, word1);
     }
+
+    @Override
+    public boolean isValidWord(final String word) {
+        // Strings out of this dictionary should not be considered existing words.
+        return false;
+    }
 }