Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1398503-rtm into lp:ubuntu-keyboard/rtm-14.09

[Michael Sheldon]

Disables automatic insertion of space characters after punctuation except when punctuation has been added by double space.

Disables automatic insertion of space characters after punctuation except when punctuation has been added by double space.

[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, in sync with rtm branch

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 (except for features not implemented in RTM)

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

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'plugins/westernsupport/westernlanguagefeatures.cpp'
--- plugins/westernsupport/westernlanguagefeatures.cpp	2014-09-08 15:09:32 +0000
+++ plugins/westernsupport/westernlanguagefeatures.cpp	2014-12-09 18:44:58 +0000
@@ -60,7 +60,7 @@
         return false;
     }
 
-    if (sentenceBreak.contains(preedit.right(1))) {
+    if (sentenceBreak.contains(preedit.mid(preedit.length() - 2, 1)) && preedit.right(1) == " ") {
         return true;
     }
 
 
=== modified file 'src/view/abstracttexteditor.cpp'
--- src/view/abstracttexteditor.cpp	2014-11-04 20:17:35 +0000
+++ src/view/abstracttexteditor.cpp	2014-12-09 18:44:58 +0000
@@ -465,10 +465,6 @@
                 // this means we should commit the candidate, add the separator and whitespace
                 d->text->setPreedit(d->text->primaryCandidate());
                 d->text->appendToPreedit(text);
-                if (d->keyboardState == "CHARACTERS" && !email_detected) {
-                    d->appendix_for_previous_preedit = d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit());
-                    d->text->appendToPreedit(d->appendix_for_previous_preedit);
-                }
                 commitPreedit();
                 if (!email_detected) {
                     auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(d->text->surroundingLeft() + d->text->preedit() + text);
@@ -484,9 +480,6 @@
                 d->text->appendToPreedit(text);
                 if (!email_detected) {
                     auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(d->text->surroundingLeft() + d->text->preedit());
-                    if(isSeparator && d->keyboardState == "CHARACTERS") {
-                        d->text->appendToPreedit(d->word_engine->languageFeature()->appendixForReplacedPreedit(d->text->preedit()));
-                    }
                 }
                 commitPreedit();
                 alreadyAppended = true;
 
=== modified file 'tests/unittests/ut_editor/ut_editor.cpp'
--- tests/unittests/ut_editor/ut_editor.cpp	2014-07-22 14:02:39 +0000
+++ tests/unittests/ut_editor/ut_editor.cpp	2014-12-09 18:44:58 +0000
@@ -114,9 +114,9 @@
         // FIXME: In the current testing infra, we cannot really test this properly, as we are using the 'backspace' character
         //  a lot during auto-correction, which is currently not handled too well here.
         QTest::newRow("auto-correct enabled, commit with space, check separators")
-                << true << "Hel ,Wor ." << "Hello , World . ";
+                << true << "Hel , Wor ." << "Hello , World .";
         QTest::newRow("auto-correct enabled, commit with separators, check separators")
-                << true << "Hel.Wor." << "Hello. World. ";
+                << true << "Hel. Wor." << "Hello. World.";
         QTest::newRow("auto-correct enabled, check if two spaces are full-stop")
                 << true << "Hel  " << "Hello . ";      
         //QTest::newRow("auto-correct enabled, check removal of unnecessary whitespaces")
@@ -183,25 +183,16 @@
         QTest::newRow("auto-correct disabled, multiple sentences with mixed punctation")
                 << false << "This is a \"first sentence\". And a second, one! "
                 << "This is a \"first sentence\". And a second, one! " << 2;
-        QTest::newRow("auto-correct enabled, multiple sentences with mixed punctation")
-                << true << "This is a \"first sentence\".And a second,one!"
-                << "This is a \"first sentence\". And a second, one! " << 2;
         QTest::newRow("auto-correct disabled, multiple sentences with dots")
                 << false << "First sentence. Second one. And Third. "
                 << "First sentence. Second one. And Third. " << 3;
-        QTest::newRow("auto-correct enabled, multiple sentences with dots")
-                << true << "First sentence.Second one.And Third."
-                << "First sentence. Second one. And Third. " << 3;
 
         // Tests for the auto-correct and autocaps separator functionality
         // FIXME: In the current testing infra, we cannot really test this properly, as we are using the 'backspace' character
         //  a lot during auto-correction, which is currently not handled too well here.
         QTest::newRow("auto-correct enabled, autocaps after separator auto-correction")
-                << true << "Hello Wor .This should be autocapsed "
-                << "Hello World . This should be autocapsed " << 1;
-        QTest::newRow("auto-correct enabled, autocaps after separator auto-correction #2")
-                << true << "Hello Wor .This should be autocapsed "
-                << "Hello World . This should be autocapsed " << 1;
+                << true << "Hello Wor . This should be autocapsed "
+                << "Hello World . This should be autocapsed " << 2;
     }
 
     Q_SLOT void testAutoCaps()