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

[Michael Sheldon]

Enable auto-punctuation for Pinyin input.

Enable auto-punctuation for Pinyin 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?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

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)]

FAILED: Continuous integration, rev:294
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/538/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/39/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/39/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/39/console

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

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

The jenkins node for the amd64 build failed, I've restarted a new ci run.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:294
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/539/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/40
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/40/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/40

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

review: Approve (continuous-integration)

=== modified file 'plugins/pinyin/src/chineselanguagefeatures.cpp'
--- plugins/pinyin/src/chineselanguagefeatures.cpp	2014-12-08 14:26:19 +0000
+++ plugins/pinyin/src/chineselanguagefeatures.cpp	2015-01-26 13:01:43 +0000
@@ -93,3 +93,8 @@
 {
     return true;
 }
+
+QString ChineseLanguageFeatures::fullStopSequence() const
+{
+    return QString("。");
+}

=== modified file 'plugins/pinyin/src/chineselanguagefeatures.h'
--- plugins/pinyin/src/chineselanguagefeatures.h	2014-12-08 14:26:19 +0000
+++ plugins/pinyin/src/chineselanguagefeatures.h	2015-01-26 13:01:43 +0000
@@ -35,6 +35,7 @@
     virtual bool isSymbol(const QString &text) const;
     virtual bool ignoreSimilarity() const;
     virtual bool wordEngineAvailable() const;
+    virtual QString fullStopSequence() const;
 };
 
 #endif // CHINESELANGUAGEFEATURES_H

=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2015-01-08 09:13:21 +0000
+++ src/view/abstracttexteditor.cpp	2015-01-26 13:01:43 +0000
@@ -544,7 +544,10 @@
 
         // every double-space character inputs one-after-another force a full-stop, so trigger it if needed
         if (d->double_space_full_stop_enabled && not look_for_a_double_space) {
-            d->look_for_a_double_space = true;
+            // Only enable if the language plugin inserts spaces after word completion (e.g. pinyin doesn't)
+            if (d->text->preedit().isEmpty() || d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit()) == " ") {
+                d->look_for_a_double_space = true;
+            }
         }
 
         if (replace_preedit) {
@@ -558,9 +561,9 @@
             }
             d->text->setPreedit(d->text->primaryCandidate());
         }
-        else if (look_for_a_double_space && not stopSequence.isEmpty()) {
+        else if (look_for_a_double_space && not stopSequence.isEmpty() && textOnLeft.right(1) == " ") {
             removeTrailingWhitespaces();
-            d->text->appendToPreedit(d->word_engine->languageFeature()->fullStopSequence());
+            d->text->appendToPreedit(stopSequence);
 
             // we need to re-evaluate autocaps after our changes to the preedit
             textOnLeft = d->text->surroundingLeft() + d->text->preedit();

=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-01-08 18:07:27 +0000
+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py	2015-01-26 13:01:43 +0000
@@ -509,6 +509,42 @@
             Eventually(Equals(expected))
         )
 
+    def test_override(self):
+        """After typing 'i' followed by a space it should get auto-corrected to 'I'
+        via the override mechanism.
+
+        """
+        text_area = self.launch_test_input_area()
+        self.ensure_focus_on_input(text_area)
+        keyboard = Keyboard()
+        self.addCleanup(keyboard.dismiss)
+
+        keyboard.type('i i i ')
+
+        expected = "I I I "
+        self.assertThat(
+            text_area.text,
+            Eventually(Equals(expected))
+        )
+
+    def test_double_space_single_character(self):
+        """Spaces should be auto-inserted after double pressing space following
+        a single character.
+
+        """
+        text_area = self.launch_test_input_area()
+        self.ensure_focus_on_input(text_area)
+        keyboard = Keyboard()
+        self.addCleanup(keyboard.dismiss)
+
+        keyboard.type('Test i  ')
+
+        expected = "Test I. "
+        self.assertThat(
+            text_area.text,
+            Eventually(Equals(expected))
+        )
+
     def test_autocomplete(self):
         """Tapping space in a field that supports auto-complete should
            complete a word.
@@ -627,6 +663,26 @@
             Eventually(Equals(expected))
         )
 
+    def test_auto_punctuation(self):
+        """A chinese full-stop character should be entered after space has
+        been pressed three times (once to complete the character, once more
+        to insert a space and then again to produce a full-stop.
+
+        """
+        text_area = self.launch_test_input_area(self.label, self.hints)
+        self.ensure_focus_on_input(text_area)
+        keyboard = Keyboard()
+        self.addCleanup(keyboard.dismiss)
+
+        keyboard.type('pinyin   ')
+
+        expected = "拼音。 "
+
+        self.assertThat(
+            text_area.text,
+            Eventually(Equals(expected))
+        )
+
 
 class UbuntuKeyboardSelection(UbuntuKeyboardTests):