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

QmlDesigner: Do not move cursor when reformating

Browse Source 
When saving a .ui.qml file the complete file is reformated.
Without this patch the cursor is moved to the bottom.

The cursor is still moved, but they line is kept.
Since we reformat the complete file this should be fine.

Change-Id: Ia1ef003e2e6ca7497dcad7e0e8044ffb99c80ea3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2017-01-19 12:09:09 +01:00
parent eeb0b8fd21
commit cba001eff8
7 changed files with 58 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qmldesigner/shortcutmanager.cpp
View File

@@ -143,19 +143,8 @@ void ShortCutManager::registerActions(const Core::Context &qmlDesignerMainContex
//Save
Core::ActionManager::registerAction(&m_saveAction, Core::Constants::SAVE, qmlDesignerMainContext);
connect(&m_saveAction, &QAction::triggered, em, [em] {
DesignerSettings settings = QmlDesignerPlugin::instance()->settings();
/* Reformat document if we have a .ui.qml file */
if (settings.value(DesignerSettingsKey::REFORMAT_UI_QML_FILES).toBool()
&& em->currentDocument()->filePath().toString().endsWith(".ui.qml"))
if (QmlJSEditor::QmlJSEditorDocument *document
= qobject_cast<QmlJSEditor::QmlJSEditorDocument *>(em->currentDocument())) {
const QString &newText = QmlJS::reformat(document->semanticInfo().document);
QTextCursor tc(document->document());
tc.movePosition(QTextCursor::Start);
tc.movePosition(QTextCursor::End, QTextCursor::KeepAnchor);
tc.insertText(newText);
}
em->saveDocument();
QmlDesignerPlugin::instance()->viewManager().reformatFileUsingTextEditorView();
em->saveDocument();
});