commit fba716c54f2a75e5ed15f98fe77a63d6955071db
author Tadashi G. Takaoka <takaoka@google.com> Mon Dec 02 06:34:10 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 02 06:34:11 2013 +0000
tree 3b8d09f1902d9bf4962be7e4b9c444a792ea30c6
parent 68c8472d47d8ceaf6e79f6295e7c3e2bdce777d6
parent ab18fb1289e6e9df1e2d0a9d53fda6aa8800eb66

Merge "Separate auto correction and spellchecker configurations"

native/jni/src/suggest/core/suggest.cpp

diff --git a/native/jni/src/suggest/core/suggest.cpp b/native/jni/src/suggest/core/suggest.cpp
index 2eda414..f84c841 100644
--- a/native/jni/src/suggest/core/suggest.cpp
+++ b/native/jni/src/suggest/core/suggest.cpp
@@ -235,8 +235,11 @@
             // Shortcut is not supported for multiple words suggestions.
             // TODO: Check shortcuts during traversal for multiple words suggestions.
             const bool sameAsTyped = TRAVERSAL->sameAsTyped(traverseSession, terminalDicNode);
+            const int shortcutBaseScore = SCORING->doesAutoCorrectValidWord() ?
+                     SCORING->calculateFinalScore(compoundDistance, traverseSession->getInputSize(),
+                             true /* forceCommit */) : finalScore;
             const int updatedOutputWordIndex = ShortcutUtils::outputShortcuts(&shortcutIt,
-                    outputWordIndex,  finalScore, outputCodePoints, frequencies, outputTypes,
+                    outputWordIndex, shortcutBaseScore, outputCodePoints, frequencies, outputTypes,
                     sameAsTyped);
             const int secondWordFirstInputIndex = terminalDicNode->getSecondWordFirstInputIndex(
                     traverseSession->getProximityInfoState(0));