1
=== modified file 'plugins/chewing/src/chewinglanguagefeatures.cpp'
2
--- plugins/chewing/src/chewinglanguagefeatures.cpp	2016-04-28 12:15:46 +0000
3
+++ plugins/chewing/src/chewinglanguagefeatures.cpp	2016-08-18 13:50:50 +0000
4
@@ -55,7 +55,7 @@
5
55
55
6
56
bool ChewingLanguageFeatures::isSeparator(const QString &text) const
56
bool ChewingLanguageFeatures::isSeparator(const QString &text) const
7
57
{
57
{
9
58
    static const QString separators = QString::fromUtf8("。、!?:\r\n");
58
    static const QString separators = QString::fromUtf8("。、!?:…\r\n");
10
59
59
11
60
    if (text.isEmpty()) {
60
    if (text.isEmpty()) {
12
61
        return false;
61
        return false;
13
62
62
14
=== modified file 'plugins/pinyin/src/chineselanguagefeatures.cpp'
15
--- plugins/pinyin/src/chineselanguagefeatures.cpp	2015-02-09 21:14:24 +0000
16
+++ plugins/pinyin/src/chineselanguagefeatures.cpp	2016-08-18 13:50:50 +0000
17
@@ -56,7 +56,7 @@
18
56
56
19
57
bool ChineseLanguageFeatures::isSeparator(const QString &text) const
57
bool ChineseLanguageFeatures::isSeparator(const QString &text) const
20
58
{
58
{
22
59
    static const QString separators = QString::fromUtf8("。、,!?:;.\r\n");
59
    static const QString separators = QString::fromUtf8("。、,!?:;.…\r\n");
23
60
60
24
61
    if (text.isEmpty()) {
61
    if (text.isEmpty()) {
25
62
        return false;
62
        return false;
26
63
63
27
=== modified file 'plugins/westernsupport/westernlanguagefeatures.cpp'
28
--- plugins/westernsupport/westernlanguagefeatures.cpp	2016-06-09 15:12:25 +0000
29
+++ plugins/westernsupport/westernlanguagefeatures.cpp	2016-08-18 13:50:50 +0000
30
@@ -77,7 +77,7 @@
31
77
77
32
78
bool WesternLanguageFeatures::isSeparator(const QString &text) const
78
bool WesternLanguageFeatures::isSeparator(const QString &text) const
33
79
{
79
{
35
80
    static const QString separators = QString::fromUtf8(",.!?:;\r\n");
80
    static const QString separators = QString::fromUtf8(",.!?:;…\r\n");
36
81
81
37
82
    if (text.isEmpty()) {
82
    if (text.isEmpty()) {
38
83
        return false;
83
        return false;
39
84
84
40
=== modified file 'src/view/abstracttexteditor.cpp'
41
--- src/view/abstracttexteditor.cpp	2016-06-15 12:44:24 +0000
42
+++ src/view/abstracttexteditor.cpp	2016-08-18 13:50:50 +0000
43
@@ -205,6 +205,7 @@
44
205
    int ignore_next_cursor_position;
205
    int ignore_next_cursor_position;
45
206
    QString ignore_next_surrounding_text;
206
    QString ignore_next_surrounding_text;
46
207
    bool look_for_a_double_space;
207
    bool look_for_a_double_space;
47
208
    bool look_for_a_triple_space;
48
208
    bool double_space_full_stop_enabled;
209
    bool double_space_full_stop_enabled;
49
209
    bool editing_middle_of_text;
210
    bool editing_middle_of_text;
50
210
    QString appendix_for_previous_preedit;
211
    QString appendix_for_previous_preedit;
51
@@ -236,6 +237,7 @@
52
236
    , ignore_next_cursor_position(-1)
237
    , ignore_next_cursor_position(-1)
53
237
    , ignore_next_surrounding_text()
238
    , ignore_next_surrounding_text()
54
238
    , look_for_a_double_space(false)
239
    , look_for_a_double_space(false)
55
240
    , look_for_a_triple_space(false)
56
239
    , double_space_full_stop_enabled(false)
241
    , double_space_full_stop_enabled(false)
57
240
    , editing_middle_of_text(false)
242
    , editing_middle_of_text(false)
58
241
    , appendix_for_previous_preedit()
243
    , appendix_for_previous_preedit()
59
@@ -356,6 +358,7 @@
60
356
    QString keyText = QString("");
358
    QString keyText = QString("");
61
357
    Qt::Key event_key = Qt::Key_unknown;
359
    Qt::Key event_key = Qt::Key_unknown;
62
358
    bool look_for_a_double_space = d->look_for_a_double_space;
360
    bool look_for_a_double_space = d->look_for_a_double_space;
63
361
    bool look_for_a_triple_space = d->look_for_a_triple_space;
64
359
    bool email_detected = false;
362
    bool email_detected = false;
65
360
363
66
361
    // Detect if the user is entering an email address and avoid spacing, autocaps and autocomplete changes
364
    // Detect if the user is entering an email address and avoid spacing, autocaps and autocomplete changes
67
@@ -368,8 +371,11 @@
68
368
        email_detected = true;
371
        email_detected = true;
69
369
    }
372
    }
70
370
373
71
374
    // we reset the flags here so that we won't have to add boilerplate code later
72
375
    if (d->look_for_a_triple_space) {
73
376
        d->look_for_a_triple_space = false;
74
377
    }
75
371
    if (look_for_a_double_space) {
378
    if (look_for_a_double_space) {
76
372
        // we reset the flag here so that we won't have to add boilerplate code later
77
373
        d->look_for_a_double_space = false;
379
        d->look_for_a_double_space = false;
78
374
    }
380
    }
79
375
381
80
@@ -464,6 +470,7 @@
81
464
    case Key::ActionSpace: {
470
    case Key::ActionSpace: {
82
465
        QString space = " ";
471
        QString space = " ";
83
466
        QString textOnLeft = d->text->surroundingLeft() + d->text->preedit();
472
        QString textOnLeft = d->text->surroundingLeft() + d->text->preedit();
84
473
        QString textOnLeftTrimmed = textOnLeft.trimmed();
85
467
        QStringList textOnRightList = d->text->surroundingRight().split("\n");
474
        QStringList textOnRightList = d->text->surroundingRight().split("\n");
86
468
        QString textOnRight;
475
        QString textOnRight;
87
469
        if (!textOnRightList.isEmpty()) {
476
        if (!textOnRightList.isEmpty()) {
88
@@ -485,6 +492,14 @@
89
485
            }
492
            }
90
486
        }
493
        }
91
487
494
92
495
        // Delete automatically inserted full stop if the user continues 
93
496
        // pressing space after a double space.
94
497
        if (look_for_a_triple_space) {
95
498
            singleBackspace();
96
499
            singleBackspace();
97
500
            d->text->appendToPreedit("  ");
98
501
        }
99
502
100
488
        if (replace_preedit) {
503
        if (replace_preedit) {
101
489
            if (!textOnRight.isEmpty() && d->editing_middle_of_text) {
504
            if (!textOnRight.isEmpty() && d->editing_middle_of_text) {
102
490
                // Don't insert a space if we are correcting a word in the middle of a sentence
505
                // Don't insert a space if we are correcting a word in the middle of a sentence
103
@@ -512,7 +527,18 @@
104
512
                d->previous_preedit_position -= 1;
527
                d->previous_preedit_position -= 1;
105
513
            }
528
            }
106
514
        }
529
        }
108
515
        else if (look_for_a_double_space && not stopSequence.isEmpty() && textOnLeft.at(textOnLeft.count() - 1).isSpace()) {
530
        // Only insert a full stop after double space if there isn't already
109
531
        // a separator, and there isn't a separator immediately prior to a ')'
110
532
        else if (look_for_a_double_space
111
533
                 && not stopSequence.isEmpty()
112
534
                 && textOnLeft.count() >= 2
113
535
                 && textOnLeft.at(textOnLeft.count() - 1).isSpace()
114
536
                 && !textOnLeft.at(textOnLeft.count() - 2).isSpace()
115
537
                 && textOnLeftTrimmed.count() > 0
116
538
                 && !d->word_engine->languageFeature()->isSeparator(textOnLeftTrimmed.at(textOnLeftTrimmed.count() - 1))
117
539
                 && !(textOnLeftTrimmed.endsWith(")") 
118
540
                      && textOnLeftTrimmed.count() > 1
119
541
                      && d->word_engine->languageFeature()->isSeparator(textOnLeftTrimmed.at(textOnLeftTrimmed.count() - 2)))) {
120
516
            removeTrailingWhitespaces();
542
            removeTrailingWhitespaces();
121
517
            if (!d->word_engine->languageFeature()->commitOnSpace()) {
543
            if (!d->word_engine->languageFeature()->commitOnSpace()) {
122
518
                // Commit when inserting a fullstop if we don't insert on spaces
544
                // Commit when inserting a fullstop if we don't insert on spaces
123
@@ -529,6 +555,7 @@
124
529
            textOnLeft = d->text->surroundingLeft() + d->text->preedit();
555
            textOnLeft = d->text->surroundingLeft() + d->text->preedit();
125
530
            auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(textOnLeft);
556
            auto_caps_activated = d->word_engine->languageFeature()->activateAutoCaps(textOnLeft);
126
531
            full_stop_inserted = true;
557
            full_stop_inserted = true;
127
558
            d->look_for_a_triple_space = true;
128
532
        }
559
        }
129
533
560
130
534
        d->text->appendToPreedit(space);
561
        d->text->appendToPreedit(space);
131
535
562
132
=== modified file 'tests/unittests/ut_editor/ut_editor.cpp'
133
--- tests/unittests/ut_editor/ut_editor.cpp	2014-12-04 17:44:17 +0000
134
+++ tests/unittests/ut_editor/ut_editor.cpp	2016-08-18 13:50:50 +0000
135
@@ -118,7 +118,17 @@
136
118
        QTest::newRow("auto-correct enabled, commit with separators, check separators")
118
        QTest::newRow("auto-correct enabled, commit with separators, check separators")
137
119
                << true << "Hel. Wor." << "Hello. World.";
119
                << true << "Hel. Wor." << "Hello. World.";
138
120
        QTest::newRow("auto-correct enabled, check if two spaces are full-stop")
120
        QTest::newRow("auto-correct enabled, check if two spaces are full-stop")
140
121
                << true << "Hel  " << "Hello . ";      
121
                << true << "Hel  " << "Hello . ";
141
122
        QTest::newRow("auto-correct enabled, check two spaces don't insert full-stop after .")
142
123
                << true << "Hello.  " << "Hello.  ";
143
124
        QTest::newRow("auto-correct enabled, check two spaces don't insert full-stop after !")
144
125
                << true << "Hello!  " << "Hello!  ";
145
126
        QTest::newRow("auto-correct enabled, check two spaces don't insert full-stop after ?")
146
127
                << true << "Hello?  " << "Hello?  ";
147
128
        QTest::newRow("auto-correct enabled, check two spaces don't insert full-stop after ...")
148
129
                << true << "Hello...  " << "Hello...  ";
149
130
        QTest::newRow("auto-correct enabled, check two spaces does insert full-stop after )")
150
131
                << true << "(Hello)  " << "(Hello) . ";
151
122
        //QTest::newRow("auto-correct enabled, check removal of unnecessary whitespaces")
132
        //QTest::newRow("auto-correct enabled, check removal of unnecessary whitespaces")
152
123
        //        << true << "Hello.       . " << "Hello.. ";
133
        //        << true << "Hello.       . " << "Hello.. ";
153
124
    }
134
    }
Reviewer	Review Type	Date Requested	Status
system-apps-ci-bot	continuous-integration		Needs Fixing on 2016-08-18
Ubuntu Phablet Team		2016-08-15	Pending
Review via email: mp+302925@code.launchpad.net