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

Merge remote-tracking branch 'origin/4.5' into master

Browse Source 
Change-Id: Ibcdd1230b40d1ca7a414843ee0f9ae4cddb29f6f
This commit is contained in:
Orgad Shaneh
2017-10-17 20:00:44 +03:00
parent 5c554c0de9 aa4e05f07b
commit 371b2bbbab
128 changed files with 412 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,19 +259,28 @@ void QmlJSEditorPlugin::reformatFile()
if (!document->isParsedCorrectly())
return;
TextEditor::TabSettings tabSettings = m_currentDocument->tabSettings();
const QString &newText = QmlJS::reformat(document,
tabSettings.m_indentSize,
tabSettings.m_tabSize);
QmlJSEditorWidget *widget = EditorManager::currentEditor()
? qobject_cast<QmlJSEditorWidget*>(EditorManager::currentEditor()->widget())
: nullptr;
if (widget) {
const int position = widget->position();
m_currentDocument->document()->setPlainText(newText);
widget->setCursorPosition(position);
// 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);
};
IEditor *ed = EditorManager::currentEditor();
if (ed) {
int line = ed->currentLine();
int column = ed->currentColumn();
setNewText();
ed->gotoLine(line, column);
} else {
m_currentDocument->document()->setPlainText(newText);
setNewText();
}
}
}