QTextCursor selection extension when inserting characters

The change makes QTextCursor not extend the selection when inserting
characters at the end of the selection, provided that the cursor
position is at the end.

Reviewed-by: Simon Hausmann
Reviewed-by: Roberto Raggi

2 files changed, 100 insertions, 2 deletions

diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index 8b85d2d..ce62834 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -92,8 +92,12 @@ QTextCursorPrivate::AdjustResult QTextCursorPrivate::adjustPosition(int position
 {
     QTextCursorPrivate::AdjustResult result = QTextCursorPrivate::CursorMoved;
     // not(!) <= , so that inserting text adjusts the cursor correctly
-    if (position < positionOfChange ||
-        (position == positionOfChange && op == QTextUndoCommand::KeepCursor)) {
+    if (position < positionOfChange
+        || (position == positionOfChange
+            && (op == QTextUndoCommand::KeepCursor
+                || anchor < position)
+            )
+         ) {
         result = CursorUnchanged;
     } else {
         if (charsAddedOrRemoved < 0 && position < positionOfChange - charsAddedOrRemoved)
diff --git a/tests/auto/qtextcursor/tst_qtextcursor.cpp b/tests/auto/qtextcursor/tst_qtextcursor.cpp
index 88ecc73..d910c8d 100644
--- a/tests/auto/qtextcursor/tst_qtextcursor.cpp
+++ b/tests/auto/qtextcursor/tst_qtextcursor.cpp
@@ -147,6 +147,8 @@ private slots:
     void task244408_wordUnderCursor_data();
     void task244408_wordUnderCursor();
 
+    void adjustCursorsOnInsert();
+
 private:
     int blockCount();
 
@@ -1658,5 +1660,97 @@ void tst_QTextCursor::task244408_wordUnderCursor()
     QCOMPARE(cursor.selectedText(), expected);
 }
 
+void tst_QTextCursor::adjustCursorsOnInsert()
+{
+    cursor.insertText("Some text before ");
+    int posBefore = cursor.position();
+    cursor.insertText("selected text");
+    int posAfter = cursor.position();
+    cursor.insertText(" some text afterwards");
+
+    QTextCursor selection = cursor;
+    selection.setPosition(posBefore);
+    selection.setPosition(posAfter, QTextCursor::KeepAnchor);
+
+    cursor.setPosition(posBefore-1);
+    cursor.insertText(QLatin1String("x"));
+    QCOMPARE(selection.anchor(), posBefore+1);
+    QCOMPARE(selection.position(), posAfter+1);
+    doc->undo();
+
+    cursor.setPosition(posBefore);
+    cursor.insertText(QLatin1String("x"));
+    QCOMPARE(selection.anchor(), posBefore+1);
+    QCOMPARE(selection.position(), posAfter+1);
+    doc->undo();
+
+    cursor.setPosition(posBefore+1);
+    cursor.insertText(QLatin1String("x"));
+    QCOMPARE(selection.anchor(), posBefore);
+    QCOMPARE(selection.position(), posAfter+1);
+    doc->undo();
+
+    cursor.setPosition(posAfter-1);
+    cursor.insertText(QLatin1String("x"));
+    QCOMPARE(selection.anchor(), posBefore);
+    QCOMPARE(selection.position(), posAfter+1);
+    doc->undo();
+
+    cursor.setPosition(posAfter);
+    cursor.insertText(QLatin1String("x"));
+    QCOMPARE(selection.anchor(), posBefore);
+    QCOMPARE(selection.position(), posAfter);
+    doc->undo();
+
+    cursor.setPosition(posAfter+1);
+    cursor.insertText(QLatin1String("x"));
+    QCOMPARE(selection.anchor(), posBefore);
+    QCOMPARE(selection.position(), posAfter);
+    doc->undo();
+
+    selection.setPosition(posAfter);
+    selection.setPosition(posBefore, QTextCursor::KeepAnchor);
+
+    cursor.setPosition(posBefore-1);
+    cursor.insertText(QLatin1String("x"));
+    QCOMPARE(selection.position(), posBefore+1);
+    QCOMPARE(selection.anchor(), posAfter+1);
+    doc->undo();
+
+    cursor.setPosition(posBefore);
+    cursor.insertText(QLatin1String("x"));
+    QCOMPARE(selection.position(), posBefore+1);
+    QCOMPARE(selection.anchor(), posAfter+1);
+    doc->undo();
+
+    cursor.setPosition(posBefore+1);
+    cursor.insertText(QLatin1String("x"));
+    QCOMPARE(selection.position(), posBefore);
+    QCOMPARE(selection.anchor(), posAfter+1);
+    doc->undo();
+
+    cursor.setPosition(posAfter-1);
+    cursor.insertText(QLatin1String("x"));
+    QCOMPARE(selection.position(), posBefore);
+    QCOMPARE(selection.anchor(), posAfter+1);
+    doc->undo();
+
+    cursor.setPosition(posAfter);
+    cursor.insertText(QLatin1String("x"));
+    QCOMPARE(selection.position(), posBefore);
+    QCOMPARE(selection.anchor(), posAfter+1);
+    doc->undo();
+
+    cursor.setPosition(posAfter+1);
+    cursor.insertText(QLatin1String("x"));
+    QCOMPARE(selection.position(), posBefore);
+    QCOMPARE(selection.anchor(), posAfter);
+    doc->undo();
+
+
+
+
+}
+
 QTEST_MAIN(tst_QTextCursor)
 #include "tst_qtextcursor.moc"