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

Merge remote-tracking branch 'origin/9.0' into qds/dev

Browse Source 
Change-Id: I02fd6f492c27d85b88af7ec8bc18ff62f2c6ed14
This commit is contained in:
Tim Jenssen
2022-11-09 12:51:00 +01:00
parent ac526d326c b038ea3a40
commit f8c99ebd9a
149 changed files with 89684 additions and 74780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,22 +20,23 @@
#include <qmljstools/qmljstoolssettings.h>
#include <qmljstools/qmljscodestylepreferences.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/editormanager.h>
#include <projectexplorer/taskhub.h>
#include <coreplugin/icore.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projecttree.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projecttree.h>
#include <projectexplorer/taskhub.h>
#include <texteditor/formattexteditor.h>
#include <texteditor/snippets/snippetprovider.h>
#include <texteditor/texteditorconstants.h>
#include <texteditor/tabsettings.h>
#include <texteditor/texteditorconstants.h>
#include <utils/fsengine/fileiconprovider.h>
#include <utils/qtcassert.h>
#include <utils/json.h>
#include <utils/qtcassert.h>
#include <QTextDocument>
#include <QMenu>
@@ -260,24 +261,14 @@ void QmlJSEditorPluginPrivate::reformatFile()
tabSettings.m_tabSize,
QmlJSTools::QmlJSToolsSettings::globalCodeStyle()->currentCodeStyleSettings().lineLength);
// QTextDocument::setPlainText cannot be used, as it would reset undo/redo history
const auto setNewText = [this, &newText]() {
auto ed = qobject_cast<TextEditor::BaseTextEditor *>(EditorManager::currentEditor());
if (ed) {
TextEditor::updateEditorText(ed->editorWidget(), newText);
} else {
QTextCursor tc(m_currentDocument->document());
tc.movePosition(QTextCursor::Start);
tc.movePosition(QTextCursor::End, QTextCursor::KeepAnchor);
tc.insertText(newText);
};
IEditor *ed = EditorManager::currentEditor();
if (ed) {
QByteArray state = ed->saveState();
int line = ed->currentLine();
int column = ed->currentColumn();
setNewText();
ed->gotoLine(line, column - 1);
ed->restoreState(state);
} else {
setNewText();
}
}
}