Merge lp:~michael-sheldon/ubuntu-keyboard/word-ribbon-tidy-up into lp:ubuntu-keyboard

[Michael Sheldon]

Merge user input and primary prediction when they match, highlight auto-completion word instead of user input.

Merge user input and primary prediction when they match, highlight auto-completion word instead of user input.

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * Yes, change to word ribbon UI requested at fit and finish sprint.

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:194
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/427/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/52

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/427/rebuild

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

Seems to break a few cases that used to work, or possibly I don't understand the new changes. I have all the switches turned on.

- If I type the word "do", I'm presented with "do" and "don" both bold on the word ribbon. I expected pressing space would insert "do" but it inserts "don".

- Seeing the same thing with "that". It's showing "that" and "than" both highlighted and space selects "than".

It doesn't always do this. Seems to be related to the context of what I'm typing. But I think the bug is there should never be two highlighted words?

review: Needs Fixing

[Michael Sheldon (michael-sheldon)]

It sounds like maybe there's a race condition with the spell checker and presage both claiming the first candidate, I'll have a look into this when I get back on Friday.

[lp:~michael-sheldon/ubuntu-keyboard/word-ribbon-tidy-up]

195. By Michael Sheldon on 2014-08-01

Merge from trunk

196. By Michael Sheldon on 2014-08-01

Use mutex when receiving new candidates asynchronously from spell checker and word predictor

197. By Michael Sheldon on 2014-08-01

Keep track of the word that suggestions have been generated for and don't report suggestions that no longer match the current pre-edit text

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:197
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/429/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/54
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/54/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/54

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/429/rebuild

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Code-wise everything looks fine, all cases seem to be handled pretty nicely. From the testing side everything looks good as well. For a moment I thought pinyin is a bit crashy, but then I checked that the same happens with the old code-base as well (bug will follow). So in overall, a green light from me! A great improvement I must say. Just hope I didn't miss anything, I'm not a big user of auto-completion and preedit ;)

+1.

review: Approve

=== modified file 'plugins/pinyin/src/pinyinplugin.cpp'
--- plugins/pinyin/src/pinyinplugin.cpp	2014-05-07 13:30:05 +0000
+++ plugins/pinyin/src/pinyinplugin.cpp	2014-08-01 15:45:12 +0000
@@ -18,7 +18,7 @@
 {
     Q_UNUSED(surroundingLeft);
     pinyinAdapter->parse(preedit);
-    Q_EMIT newPredictionSuggestions(pinyinAdapter->getWordCandidates());
+    Q_EMIT newPredictionSuggestions(preedit, pinyinAdapter->getWordCandidates());
 }
 
 void PinyinPlugin::wordCandidateSelected(QString word)

=== modified file 'plugins/pinyin/src/pinyinplugin.h'
--- plugins/pinyin/src/pinyinplugin.h	2014-05-07 13:30:05 +0000
+++ plugins/pinyin/src/pinyinplugin.h	2014-08-01 15:45:12 +0000
@@ -35,7 +35,7 @@
     virtual bool setSpellCheckerLanguage(const QString& languageId) { Q_UNUSED(languageId); return false; }
 
 signals:
-    void newPredictionSuggestions(QStringList suggestions);
+    void newPredictionSuggestions(QString word, QStringList suggestions);
     
 public slots:
     

=== modified file 'plugins/westernsupport/predictivetextworker.cpp'
--- plugins/westernsupport/predictivetextworker.cpp	2014-05-15 14:10:15 +0000
+++ plugins/westernsupport/predictivetextworker.cpp	2014-08-01 15:45:12 +0000
@@ -66,7 +66,7 @@
         qWarning() << "An exception was thrown in libpresage when calling predict(), exception nr: " << error;
     }
 
-    Q_EMIT newSuggestions(list);
+    Q_EMIT newSuggestions(preedit, list);
 }
 
 void PredictiveTextWorker::setPredictionLanguage(QString locale)

=== modified file 'plugins/westernsupport/predictivetextworker.h'
--- plugins/westernsupport/predictivetextworker.h	2014-05-15 14:10:15 +0000
+++ plugins/westernsupport/predictivetextworker.h	2014-08-01 15:45:12 +0000
@@ -51,7 +51,7 @@
     void updateSpellCheckWord(QString word);
 
 signals:
-    void newSuggestions(QStringList suggestions);
+    void newSuggestions(QString word, QStringList suggestions);
 
 private:
     std::string m_candidatesContext;

=== modified file 'plugins/westernsupport/spellcheckerworker.cpp'
--- plugins/westernsupport/spellcheckerworker.cpp	2014-05-15 14:10:15 +0000
+++ plugins/westernsupport/spellcheckerworker.cpp	2014-08-01 15:45:12 +0000
@@ -40,7 +40,7 @@
 void SpellCheckerWorker::suggest(const QString& word, int limit)
 {
     QStringList suggestions = m_spellChecker.suggest(word, limit);
-    Q_EMIT newSuggestions(suggestions);
+    Q_EMIT newSuggestions(word, suggestions);
 }
 
 void SpellCheckerWorker::newSpellCheckWord(QString word)

=== modified file 'plugins/westernsupport/spellcheckerworker.h'
--- plugins/westernsupport/spellcheckerworker.h	2014-05-15 14:10:15 +0000
+++ plugins/westernsupport/spellcheckerworker.h	2014-08-01 15:45:12 +0000
@@ -48,7 +48,7 @@
     void updateSpellCheckWord(QString word);
 
 signals:
-    void newSuggestions(QStringList suggestions);
+    void newSuggestions(QString word, QStringList suggestions);
 
 private:
     SpellChecker m_spellChecker;

=== modified file 'plugins/westernsupport/westernlanguagesplugin.cpp'
--- plugins/westernsupport/westernlanguagesplugin.cpp	2014-05-19 11:53:27 +0000
+++ plugins/westernsupport/westernlanguagesplugin.cpp	2014-08-01 15:45:12 +0000
@@ -15,7 +15,7 @@
     SpellCheckerWorker *spellWorker = new SpellCheckerWorker();
     spellWorker->moveToThread(m_spellCheckThread);
 
-    connect(spellWorker, SIGNAL(newSuggestions(QStringList)), this, SIGNAL(newSpellingSuggestions(QStringList)));
+    connect(spellWorker, SIGNAL(newSuggestions(QString, QStringList)), this, SIGNAL(newSpellingSuggestions(QString, QStringList)));
     connect(this, SIGNAL(newSpellCheckWord(QString)), spellWorker, SLOT(newSpellCheckWord(QString)));
     connect(this, SIGNAL(setSpellCheckLanguage(QString)), spellWorker, SLOT(setLanguage(QString)));
     connect(this, SIGNAL(setSpellCheckLimit(int)), spellWorker, SLOT(setLimit(int)));
@@ -27,7 +27,7 @@
     PredictiveTextWorker *predictiveWorker = new PredictiveTextWorker();
     predictiveWorker->moveToThread(m_predictiveTextThread);
 
-    connect(predictiveWorker, SIGNAL(newSuggestions(QStringList)), this, SIGNAL(newPredictionSuggestions(QStringList)));
+    connect(predictiveWorker, SIGNAL(newSuggestions(QString, QStringList)), this, SIGNAL(newPredictionSuggestions(QString, QStringList)));
     connect(this, SIGNAL(parsePredictionText(QString, QString)), predictiveWorker, SLOT(parsePredictionText(QString, QString)));
     connect(this, SIGNAL(setPredictionLanguage(QString)), predictiveWorker, SLOT(setPredictionLanguage(QString)));
     connect(this, SIGNAL(updateSpellCheckWord(QString)), predictiveWorker, SLOT(updateSpellCheckWord(QString)));

=== modified file 'plugins/westernsupport/westernlanguagesplugin.h'
--- plugins/westernsupport/westernlanguagesplugin.h	2014-05-19 11:53:27 +0000
+++ plugins/westernsupport/westernlanguagesplugin.h	2014-08-01 15:45:12 +0000
@@ -36,8 +36,8 @@
     virtual bool setSpellCheckerLanguage(const QString& languageId);
 
 signals:
-    void newSpellingSuggestions(QStringList suggestions);
-    void newPredictionSuggestions(QStringList suggestions);
+    void newSpellingSuggestions(QString word, QStringList suggestions);
+    void newPredictionSuggestions(QString word, QStringList suggestions);
     void newSpellCheckWord(QString word);
     void setSpellCheckLimit(int limit);
     void setSpellCheckLanguage(QString language);

=== modified file 'qml/WordRibbon.qml'
--- qml/WordRibbon.qml	2014-05-20 06:49:39 +0000
+++ qml/WordRibbon.qml	2014-08-01 15:45:12 +0000
@@ -57,7 +57,7 @@
                     font.pixelSize: units.gu(2);
                     font.family: "Ubuntu Medium"
                     color: "#999999"
-                    font.bold: isUserInput
+                    font.bold: isPrimaryCandidate
                     text: word;
                 }
             }

=== modified file 'src/lib/logic/abstractlanguageplugin.h'
--- src/lib/logic/abstractlanguageplugin.h	2014-05-07 13:30:05 +0000
+++ src/lib/logic/abstractlanguageplugin.h	2014-08-01 15:45:12 +0000
@@ -54,8 +54,8 @@
     virtual bool setSpellCheckerLanguage(const QString& languageId);
 
 signals:
-    void newSpellingSuggestions(QStringList suggestions);
-    void newPredictionSuggestions(QStringList suggestions);
+    void newSpellingSuggestions(QString word, QStringList suggestions);
+    void newPredictionSuggestions(QString word, QStringList suggestions);
 };
 
 #endif // ABSTRACTLANGUAGEPLUGIN_H

=== modified file 'src/lib/logic/abstractwordengine.cpp'
--- src/lib/logic/abstractwordengine.cpp	2014-04-24 13:18:54 +0000
+++ src/lib/logic/abstractwordengine.cpp	2014-08-01 15:45:12 +0000
@@ -172,6 +172,13 @@
     Q_UNUSED(on);
     qDebug() << Q_FUNC_INFO << "should be implemented by inherited class";
 }
+
+void AbstractWordEngine::setAutoCorrectEnabled(bool on)
+{
+    Q_UNUSED(on);
+    qDebug() << Q_FUNC_INFO << "should be implemented by inherited class";
+}
+
 /*
 AbstractLanguageFeature* AbstractWordEngine::languageFeature()
 {

=== modified file 'src/lib/logic/abstractwordengine.h'
--- src/lib/logic/abstractwordengine.h	2014-05-01 14:40:09 +0000
+++ src/lib/logic/abstractwordengine.h	2014-08-01 15:45:12 +0000
@@ -64,6 +64,7 @@
 
     Q_SLOT virtual void setWordPredictionEnabled(bool on);
     Q_SLOT virtual void setSpellcheckerEnabled(bool on);
+    Q_SLOT virtual void setAutoCorrectEnabled(bool on);
 
     void clearCandidates();
     void computeCandidates(Model::Text *text);

=== modified file 'src/lib/logic/wordengine.cpp'
--- src/lib/logic/wordengine.cpp	2014-07-23 11:21:23 +0000
+++ src/lib/logic/wordengine.cpp	2014-08-01 15:45:12 +0000
@@ -56,12 +56,16 @@
 
     bool correct_spelling;
 
+    bool auto_correct_enabled;
+
     LanguagePluginInterface* languagePlugin;
 
     QPluginLoader pluginLoader;
 
     WordCandidateList* candidates;
 
+    QString currentPreedit;
+
     explicit WordEnginePrivate();
 
     QString currentPlugin;
@@ -105,6 +109,7 @@
     , use_spell_checker(false)
     , is_preedit_capitalized(false)
     , correct_spelling(false)
+    , auto_correct_enabled(false)
     , languagePlugin(0)
 {
     loadPlugin(DEFAULT_PLUGIN);
@@ -200,6 +205,13 @@
         Q_EMIT enabledChanged(isEnabled());
 }
 
+void WordEngine::setAutoCorrectEnabled(bool enabled)
+{
+    Q_D(WordEngine);
+
+    d->auto_correct_enabled = enabled;
+}
+
 void WordEngine::onWordCandidateSelected(QString word)
 {
     Q_D(WordEngine);
@@ -211,6 +223,8 @@
 {
     Q_D(WordEngine);
 
+    d->currentPreedit = text->preedit();
+
     d->candidates = new WordCandidateList();
     const QString &preedit(text->preedit());
     d->is_preedit_capitalized = not preedit.isEmpty() && preedit.at(0).isUpper();
@@ -240,10 +254,19 @@
     }
 }
 
-void WordEngine::newSpellingSuggestions(QStringList suggestions)
+void WordEngine::newSpellingSuggestions(QString word, QStringList suggestions)
 {
     Q_D(WordEngine);
 
+    if (word != d->currentPreedit) {
+        // Don't add suggestions coming in for a previous word
+        return;
+    }
+
+    // Spelling and prediction suggestions arrive asynchronously
+    // So we need to ensure only one primary candidate is selected
+    suggestionMutex.lock();
+
     // Only append candidates if we don't have the correct spelling, as these
     // might be candidates from an earlier version of the word, before it was
     // spelt correctly
@@ -252,41 +275,86 @@
             appendToCandidates(d->candidates, WordCandidate::SourceSpellChecking, correction);
         }
 
-        Q_EMIT candidatesChanged(*d->candidates);
-
-        // Candidates always has at least one entry from the user input candidate
-        Q_EMIT primaryCandidateChanged(d->candidates->size() == 1 ? QString()
-                                                                : d->candidates->at(1).label());
+        calculatePrimaryCandidate();
     }
 
     Q_EMIT preeditFaceChanged(d->candidates->size() == 1 ? (d->correct_spelling ? Model::Text::PreeditDefault
                                                                                 : Model::Text::PreeditNoCandidates)
                                                          : Model::Text::PreeditDefault);
+
+    suggestionMutex.unlock();
 }
 
-void WordEngine::newPredictionSuggestions(QStringList suggestions)
+void WordEngine::newPredictionSuggestions(QString word, QStringList suggestions)
 {
     Q_D(WordEngine);
 
+    if (word != d->currentPreedit) {
+        // Don't add suggestions coming in for a previous word
+        return;
+    }
+
+    // Spelling and prediction suggestions arrive asynchronously
+    // So we need to ensure only one primary candidate is selected
+    suggestionMutex.lock();
+
     // If the current user entry is a valid word, add this as the first prediction
     if(d->correct_spelling) {
         appendToCandidates(d->candidates, WordCandidate::SourceSpellChecking, d->candidates->at(0).word());
     }
 
     Q_FOREACH(const QString &correction, suggestions) {
-        if(correction != d->candidates->at(0).word()) { // Don't repeat correctly spelt user word
-            appendToCandidates(d->candidates, WordCandidate::SourceSpellChecking, correction);
-        }
+        appendToCandidates(d->candidates, WordCandidate::SourceSpellChecking, correction);
     }
 
-    Q_EMIT candidatesChanged(*d->candidates);
-
-    Q_EMIT primaryCandidateChanged(d->candidates->size() == 1 ? QString()
-                                                              : d->candidates->at(1).label());
+    calculatePrimaryCandidate();
 
     Q_EMIT preeditFaceChanged(d->candidates->size() == 1 ? (d->correct_spelling ? Model::Text::PreeditDefault
                                                                                 : Model::Text::PreeditNoCandidates)
                                                          : Model::Text::PreeditDefault);
+
+    suggestionMutex.unlock();
+}
+
+void WordEngine::calculatePrimaryCandidate() 
+{
+    Q_D(WordEngine);
+
+    if (!d->auto_correct_enabled) {
+        if (d->candidates->size() > 1 && d->candidates->at(0).word() == d->candidates->at(1).word()) {
+            // Avoid duplicating the user input if the first prediction matches
+            d->candidates->removeAt(1);
+        }
+        Q_EMIT candidatesChanged(*d->candidates);
+        return;
+    }
+
+    if (d->candidates->size() == 0) {
+        // We should always have at least one entry due to the user input
+        qWarning() << __PRETTY_FUNCTION__ << "User candidate missing";
+    } else if (d->candidates->size() == 1) {
+        // We don't have any predictions, so the user input is the primary candidate
+        WordCandidate primary = d->candidates->value(0);
+        Q_EMIT primaryCandidateChanged(primary.word());
+    } else if (d->candidates->at(0).word() == d->candidates->at(1).word()) {
+        // The user candidate matches the first prediction; remove the prediction
+        // and make the user input the primary candidate so as not to duplicate
+        // the word.
+        d->candidates->removeAt(1);
+        WordCandidate primary = d->candidates->value(0);
+        primary.setPrimary(true);
+        d->candidates->replace(0, primary);
+        Q_EMIT primaryCandidateChanged(primary.word());
+    } else {
+        // The first prediction is the primary candidate
+        WordCandidate primary = d->candidates->value(1);
+        primary.setPrimary(true);
+        d->candidates->replace(1, primary);
+        Q_EMIT primaryCandidateChanged(primary.word());
+    }
+
+    Q_EMIT candidatesChanged(*d->candidates);
+
 }
 
 void WordEngine::addToUserDictionary(const QString &word)
@@ -342,8 +410,8 @@
     if (ok)
         d->languagePlugin->setSpellCheckerEnabled(d->use_spell_checker);
 
-    connect((AbstractLanguagePlugin *) d->languagePlugin, SIGNAL(newSpellingSuggestions(QStringList)), this, SLOT(newSpellingSuggestions(QStringList)));
-    connect((AbstractLanguagePlugin *) d->languagePlugin, SIGNAL(newPredictionSuggestions(QStringList)), this, SLOT(newPredictionSuggestions(QStringList)));
+    connect((AbstractLanguagePlugin *) d->languagePlugin, SIGNAL(newSpellingSuggestions(QString, QStringList)), this, SLOT(newSpellingSuggestions(QString, QStringList)));
+    connect((AbstractLanguagePlugin *) d->languagePlugin, SIGNAL(newPredictionSuggestions(QString, QStringList)), this, SLOT(newPredictionSuggestions(QString, QStringList)));
 }
 
 AbstractLanguageFeatures* WordEngine::languageFeature()

=== modified file 'src/lib/logic/wordengine.h'
--- src/lib/logic/wordengine.h	2014-06-30 11:31:44 +0000
+++ src/lib/logic/wordengine.h	2014-08-01 15:45:12 +0000
@@ -38,6 +38,7 @@
 #include "languageplugininterface.h"
 
 #include <QtCore>
+#include <QMutex>
 
 namespace MaliitKeyboard {
 namespace Logic {
@@ -61,6 +62,7 @@
 
     virtual void addToUserDictionary(const QString &word);
     virtual void setSpellcheckerEnabled(bool enabled);
+    virtual void setAutoCorrectEnabled(bool enabled);
     //! \reimp_end
 
     void appendToCandidates(WordCandidateList *candidates,
@@ -69,8 +71,8 @@
 
     Q_SLOT void onWordCandidateSelected(QString word);
     Q_SLOT void onLanguageChanged(const QString& languageId);
-    Q_SLOT void newSpellingSuggestions(QStringList suggestions);
-    Q_SLOT void newPredictionSuggestions(QStringList suggestions);
+    Q_SLOT void newSpellingSuggestions(QString word, QStringList suggestions);
+    Q_SLOT void newPredictionSuggestions(QString word, QStringList suggestions);
 
     virtual AbstractLanguageFeatures* languageFeature();
 
@@ -78,8 +80,11 @@
     //! \reimp
     virtual void fetchCandidates(Model::Text *text);
     //! \reimp_end
+    void calculatePrimaryCandidate();
 
     const QScopedPointer<WordEnginePrivate> d_ptr;
+
+    QMutex suggestionMutex;
 };
 
 }} // namespace Logic, MaliitKeyboard

=== modified file 'src/lib/models/wordcandidate.cpp'
--- src/lib/models/wordcandidate.cpp	2013-11-07 17:43:22 +0000
+++ src/lib/models/wordcandidate.cpp	2014-08-01 15:45:12 +0000
@@ -39,6 +39,7 @@
     , m_label()
     , m_source(SourceUnknown)
     , m_word()
+    , m_primary(false)
 {}
 
 WordCandidate::WordCandidate(Source source, const QString &word)
@@ -47,6 +48,7 @@
     , m_label()
     , m_source(source)
     , m_word(word)
+    , m_primary(false)
 {
     if (source == WordCandidate::SourceUser) {
         m_label = QString(QT_TR_NOOP("Add '%1' to user dictionary")).arg(word);
@@ -126,6 +128,16 @@
     m_word = word;
 }
 
+bool WordCandidate::primary() const
+{
+    return m_primary;
+}
+
+void WordCandidate::setPrimary(const bool primary)
+{
+    m_primary = primary;
+}
+
 bool operator==(const WordCandidate &lhs,
                 const WordCandidate &rhs)
 {

=== modified file 'src/lib/models/wordcandidate.h'
--- src/lib/models/wordcandidate.h	2013-11-07 17:43:22 +0000
+++ src/lib/models/wordcandidate.h	2014-08-01 15:45:12 +0000
@@ -54,6 +54,7 @@
     QString m_label;
     Source m_source;
     QString m_word;
+    bool m_primary;
 
 public:
     explicit WordCandidate();
@@ -79,6 +80,9 @@
 
     QString word() const;
     void setWord(const QString &word);
+
+    bool primary() const;
+    void setPrimary(const bool primary);
 };
 
 typedef QList<WordCandidate> WordCandidateList;

=== modified file 'src/lib/models/wordribbon.cpp'
--- src/lib/models/wordribbon.cpp	2014-05-15 14:10:15 +0000
+++ src/lib/models/wordribbon.cpp	2014-08-01 15:45:12 +0000
@@ -42,6 +42,7 @@
 {
     m_roles.insert(WordRole, "word");
     m_roles.insert(IsUserInputRole, "isUserInput");
+    m_roles.insert(IsPrimaryCandidateRole, "isPrimaryCandidate");
 }
 
 bool WordRibbon::valid() const
@@ -128,6 +129,9 @@
     case WordRibbon::IsUserInputRole:
         return m_candidates.at(index.row()).source() == WordCandidate::SourceUser;
         break;
+    case WordRibbon::IsPrimaryCandidateRole:
+        return m_candidates.at(index.row()).primary();
+        break;
     default:
         break;
     }

=== modified file 'src/lib/models/wordribbon.h'
--- src/lib/models/wordribbon.h	2014-05-14 15:48:09 +0000
+++ src/lib/models/wordribbon.h	2014-08-01 15:45:12 +0000
@@ -58,7 +58,8 @@
 
     enum WordRibbonRoles {
              WordRole = Qt::UserRole + 1,
-             IsUserInputRole
+             IsUserInputRole,
+             IsPrimaryCandidateRole
          };
 
     virtual QVariant data(const QModelIndex &index, int role) const;

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2014-07-25 10:15:16 +0000
+++ src/view/abstracttexteditor.cpp	2014-08-01 15:45:12 +0000
@@ -360,6 +360,9 @@
 
     connect(word_engine, SIGNAL(primaryCandidateChanged(QString)),
             this,        SLOT(setPrimaryCandidate(QString)));
+    
+    connect(this,        SIGNAL(autoCorrectEnabledChanged(bool)),
+            word_engine, SLOT(setAutoCorrectEnabled(bool)));
 
     setPreeditEnabled(word_engine->isEnabled());
 }
@@ -899,12 +902,8 @@
         d->text->removeFromPreedit(1);
         textOnLeft += d->text->preedit();
         
-        // Don't find word candidates if the user is holding down backspace
-        if(!d->repeating_backspace) {
-            d->word_engine->computeCandidates(d->text.data());
-        } else {
-            Q_EMIT wordCandidatesChanged(WordCandidateList());
-        }
+        // Clear previous word candidates
+        Q_EMIT wordCandidatesChanged(WordCandidateList());
         sendPreeditString(d->text->preedit(), d->text->preeditFace(),
                           Replacement());