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

qmljs: do not reset undo/redo history in reformatting

Browse Source 
Task-number: QTCREATORBUG-18645
Change-Id: I5b64fa5e59af3d871d3124d668bfd1f86883e752
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Marco Benelli
2017-09-08 11:19:21 +02:00
parent ba54fa8a10
commit 267167a097
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/qmljseditor/qmljseditorplugin.cpp
View File

@@ -259,19 +259,29 @@ void QmlJSEditorPlugin::reformatFile()
if (!document->isParsedCorrectly()) if (!document->isParsedCorrectly())
return; return;
TextEditor::TabSettings tabSettings = m_currentDocument->tabSettings(); TextEditor::TabSettings tabSettings = m_currentDocument->tabSettings();
const QString &newText = QmlJS::reformat(document, const QString &newText = QmlJS::reformat(document,
tabSettings.m_indentSize, tabSettings.m_indentSize,
tabSettings.m_tabSize); tabSettings.m_tabSize);
// QTextDocument::setPlainText cannot be used, as it would reset undo/redo history
const auto setNewText = [this, &newText]() {
QTextCursor tc(m_currentDocument->document());
tc.movePosition(QTextCursor::Start);
tc.movePosition(QTextCursor::End, QTextCursor::KeepAnchor);
tc.insertText(newText);
};
QmlJSEditorWidget *widget = EditorManager::currentEditor() QmlJSEditorWidget *widget = EditorManager::currentEditor()
? qobject_cast<QmlJSEditorWidget*>(EditorManager::currentEditor()->widget()) ? qobject_cast<QmlJSEditorWidget*>(EditorManager::currentEditor()->widget())
: nullptr; : nullptr;
if (widget) { if (widget) {
const int position = widget->position(); const int position = widget->position();
m_currentDocument->document()->setPlainText(newText); setNewText();
widget->setCursorPosition(position); widget->setCursorPosition(position);
} else { } else {
m_currentDocument->document()->setPlainText(newText); setNewText();
} }
} }
} }