TextEditor: Fix quickfix formatting

... for e.g. function insertion. In some contexts, the insertion
position is on the last line of some unrelated code (e.g. a preceding
function implementation) and the inserted code starts with a newline. In
that case, advance the position of the formatting cursor, so that we do
not accidentally format the existing code.

Fixes: QTCREATORBUG-30229
Change-Id: Id0be7f22e1797affa0602bb1d392a5e0802cbdcd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>

1 files changed, 6 insertions, 1 deletions

diff --git a/src/plugins/texteditor/refactoringchanges.h b/src/plugins/texteditor/refactoringchanges.h
index c7fd87f675..913c731df2 100644
--- a/src/plugins/texteditor/refactoringchanges.h
+++ b/src/plugins/texteditor/refactoringchanges.h
@@ -16,6 +16,8 @@
 #include <QSharedPointer>
 #include <QString>
 
+#include <utility>
+
 QT_BEGIN_NAMESPACE
 class QTextDocument;
 QT_END_NAMESPACE
@@ -85,7 +87,10 @@ private:
     mutable QTextDocument *m_document = nullptr;
     TextEditorWidget *m_editor = nullptr;
     Utils::ChangeSet m_changes;
-    QList<QTextCursor> m_formattingCursors;
+
+    // The bool indicates whether to advance the start position.
+    QList<std::pair<QTextCursor, bool>> m_formattingCursors;
+
     bool m_openEditor = false;
     bool m_activateEditor = false;
     int m_editorCursorPosition = -1;