Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1312329 into lp:ubuntu-keyboard

[Michael Sheldon]

Re-evaluate the state of autocaps when the user is deleting characters and when the cursor position changes to the beginning of a field

Re-evaluates the state of autocaps when the user is deleting characters and when the cursor position changes to the beginning of a field (e.g. when that field is cleared via an external action).

[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?

 * No change

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

 * No change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:161
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/384/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/9/console

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

review: Needs Fixing (continuous-integration)

[lp:~michael-sheldon/ubuntu-keyboard/fix-1312329]

162. By Michael Sheldon on 2014-05-16

Merge from trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:162
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/386/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/11/console

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

review: Needs Fixing (continuous-integration)

[lp:~michael-sheldon/ubuntu-keyboard/fix-1312329]

163. By Michael Sheldon on 2014-05-16

Fix activation of autocaps on backspace when word immediately following punctuation is still in pre-edit

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:163
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/387/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/12/console

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

review: Needs Fixing (continuous-integration)

[lp:~michael-sheldon/ubuntu-keyboard/fix-1312329]

164. By Michael Sheldon on 2014-05-16

Use mock word engine for repeat backspace tests instead of attempting to load system plugin

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

Did you perform an exploratory manual test run of the 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/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

=== modified file 'src/plugin/inputmethod.cpp'
--- src/plugin/inputmethod.cpp	2014-05-01 16:39:00 +0000
+++ src/plugin/inputmethod.cpp	2014-05-16 16:13:27 +0000
@@ -158,6 +158,7 @@
     qDebug() << "inputMethod::reset()";
     Q_D(InputMethod);
     d->editor.clearPreedit();
+    d->previous_position = -1;
 }
 
 void InputMethod::setPreedit(const QString &preedit,
@@ -201,9 +202,7 @@
 
 void InputMethod::handleFocusChange(bool focusIn)
 {
-    if (focusIn) {
-        checkInitialAutocaps();
-    } else {
+    if (!focusIn) {
         hide();
     }
 }
@@ -357,9 +356,16 @@
     if (ok) {
         d->editor.text()->setSurrounding(text);
         d->editor.text()->setSurroundingOffset(position);
+
+        updateAutoCaps();
+
+        // If we're at the beginning of a text field (e.g. because it's been cleared,
+        // or the cursor has been moved) then re-evaluate initial autocaps
+        if (position == 0 && position != d->previous_position) {
+            checkInitialAutocaps();
+        }
+        d->previous_position = position;
     }
-
-    updateAutoCaps();
 }
 
 void InputMethod::updateWordEngine()
@@ -404,7 +410,6 @@
 void InputMethod::checkInitialAutocaps()
 {
     Q_D(InputMethod);
-    update();
 
     if (d->autocapsEnabled) {
         QString text;

=== modified file 'src/plugin/inputmethod_p.h'
--- src/plugin/inputmethod_p.h	2014-05-01 16:39:00 +0000
+++ src/plugin/inputmethod_p.h	2014-05-16 16:13:27 +0000
@@ -62,6 +62,8 @@
 
     WordRibbon* wordRibbon;
 
+    int previous_position;
+
     explicit InputMethodPrivate(InputMethod * const _q,
                                 MAbstractInputMethodHost *host)
         : q(_q)
@@ -79,6 +81,7 @@
         , m_geometry(new KeyboardGeometry(q))
         , m_settings()
         , wordRibbon(new WordRibbon)
+        , previous_position(-1)
     {
         applicationApiWrapper->setGeometryItem(m_geometry);
 

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2014-05-09 12:51:35 +0000
+++ src/view/abstracttexteditor.cpp	2014-05-16 16:13:27 +0000
@@ -787,10 +787,16 @@
 {
     Q_D(AbstractTextEditor);
 
+    QString textOnLeft = d->text->surroundingLeft();
+
     if (d->text->preedit().isEmpty()) {
         sendKeyPressAndReleaseEvents(Qt::Key_Backspace, Qt::NoModifier);
+        // Deletion of surrounding text isn't updated in the model until later
+        // Update it locally here for autocaps detection
+        textOnLeft.chop(1);
     } else {
         d->text->removeFromPreedit(1);
+        textOnLeft += d->text->preedit();
         
         // Don't find word candidates if the user is holding down backspace
         if(!d->repeating_backspace) {
@@ -812,6 +818,13 @@
         }
     }
 
+    textOnLeft = textOnLeft.trimmed();
+
+    const bool auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(textOnLeft);
+    if (auto_caps_activated && d->auto_caps_enabled) {
+        Q_EMIT autoCapsActivated();
+    }
+
     d->backspace_sent = true;
 }
 

=== modified file 'tests/unittests/ut_repeat-backspace/ut_repeat-backspace.cpp'
--- tests/unittests/ut_repeat-backspace/ut_repeat-backspace.cpp	2014-04-02 11:47:41 +0000
+++ tests/unittests/ut_repeat-backspace/ut_repeat-backspace.cpp	2014-05-16 16:13:27 +0000
@@ -34,6 +34,7 @@
 #include "models/text.h"
 #include "logic/wordengine.h"
 #include "plugin/editor.h"
+#include "common/wordengineprobe.h"
 
 #include <inputmethodhostprobe.h>
 
@@ -68,7 +69,7 @@
 
     Q_SLOT void init()
     {
-        editor.reset(new Editor(options, new Model::Text, new Logic::WordEngine));
+        editor.reset(new Editor(options, new Model::Text, new Logic::WordEngineProbe));
         host.reset(new InputMethodHostProbe);
         editor->setHost(host.data());
     }

=== modified file 'tests/unittests/ut_repeat-backspace/ut_repeat-backspace.pro'
--- tests/unittests/ut_repeat-backspace/ut_repeat-backspace.pro	2013-11-06 09:31:37 +0000
+++ tests/unittests/ut_repeat-backspace/ut_repeat-backspace.pro	2014-05-16 16:13:27 +0000
@@ -15,8 +15,10 @@
 PRE_TARGETDEPS += $${TOP_BUILDDIR}/$${UBUNTU_KEYBOARD_LIB}
 
 HEADERS += \
+    ../common/wordengineprobe.h \
 
 SOURCES += \
+    ../common/wordengineprobe.cpp \
     ut_repeat-backspace.cpp \
 
 target.path = $$INSTALL_BIN