feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangFormat: Do not create extra operations to undo on save

Browse Source 
If formatting is applied on save do not create a new replacement
for each replacement action.
Instead join the last edit block to make it possible to undo the
formatting in one go.

Change-Id: Ie0cb66eb5e76998e5045c1183f5f796e5a718659
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
Ivan Donchevskii
2019-02-08 08:59:06 +01:00
parent e20a0ed580
commit f8dd6b35ec
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/cppeditor/cppeditordocument.cpp
View File

@@ -462,6 +462,8 @@ static int formatRange(QTextDocument *doc,
bool CppEditorDocument::save(QString *errorString, const QString &fileName, bool autoSave) bool CppEditorDocument::save(QString *errorString, const QString &fileName, bool autoSave)
{ {
if (indenter()->formatOnSave()) { if (indenter()->formatOnSave()) {
QTextCursor cursor(document());
cursor.joinPreviousEditBlock();
auto *layout = qobject_cast<TextEditor::TextDocumentLayout *>(document()->documentLayout()); auto *layout = qobject_cast<TextEditor::TextDocumentLayout *>(document()->documentLayout());
const int documentRevision = layout->lastSaveRevision; const int documentRevision = layout->lastSaveRevision;
@@ -483,6 +485,7 @@ bool CppEditorDocument::save(QString *errorString, const QString &fileName, bool
} }
if (editedRange.first != -1) if (editedRange.first != -1)
formatRange(document(), indenter(), editedRange, tabSettings()); formatRange(document(), indenter(), editedRange, tabSettings());
cursor.endEditBlock();
} }
return TextEditor::TextDocument::save(errorString, fileName, autoSave); return TextEditor::TextDocument::save(errorString, fileName, autoSave);