commit 0f276de04d3493a4777a29eebbc88253db427edb
author Keisuke Kuroynagi <ksk@google.com> Wed Jul 03 11:34:15 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 03 11:34:15 2013 +0000
tree 82b6c73bdb4b623b31a59b5ea0219b8e55104c32
parent 88d0138d9818b49d37cf44a25b96440ea0fba507
parent 9a4f7a3761684ee2122485c7ae111f6287d105d6

Merge "Disable shortcut output for multi-word suggestions."

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 173a612..3deeb3c 100644
--- a/native/jni/src/suggest/core/suggest.cpp
+++ b/native/jni/src/suggest/core/suggest.cpp
@@ -227,9 +227,14 @@
             ++outputWordIndex;
         }
 
-        const bool sameAsTyped = TRAVERSAL->sameAsTyped(traverseSession, terminalDicNode);
-        outputWordIndex = ShortcutUtils::outputShortcuts(&terminalAttributes, outputWordIndex,
-                finalScore, outputCodePoints, frequencies, outputTypes, sameAsTyped);
+        if (!terminalDicNode->hasMultipleWords()) {
+            // Shortcut is not supported for multiple words suggestions.
+            // TODO: Check shortcuts during traversal for multiple words suggestions.
+            const bool sameAsTyped = TRAVERSAL->sameAsTyped(traverseSession, terminalDicNode);
+            outputWordIndex = ShortcutUtils::outputShortcuts(&terminalAttributes, outputWordIndex,
+                    finalScore, outputCodePoints, frequencies, outputTypes, sameAsTyped);
+
+        }
         DicNode::managedDelete(terminalDicNode);
     }