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

LanguageClient: Improve formatting

Browse Source 
Use Utils::ChangeSet and TextEditor::RefactoringChanges to apply the
text edits that are reported from language server to format the current
file.

Change-Id: Id2f490b6e2791f676ebc751219bfbbf9e178f120
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2021-01-29 13:53:20 +01:00
parent 2d92ae391a
commit 15b0a902e9
6 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/languageclient/languageclientformatter.h
View File

@@ -41,7 +41,7 @@ public:
LanguageClientFormatter(TextEditor::TextDocument *document, Client *client);
~LanguageClientFormatter() override;
QFutureWatcher<Utils::Text::Replacements> *format(
QFutureWatcher<Utils::ChangeSet> *format(
const QTextCursor &cursor, const TextEditor::TabSettings &tabSettings) override;
private:
@@ -53,7 +53,7 @@ private:
QMetaObject::Connection m_cancelConnection;
TextEditor::TextDocument *m_document; // not owned
bool m_ignoreCancel = false;
QFutureInterface<Utils::Text::Replacements> m_progress;
QFutureInterface<Utils::ChangeSet> m_progress;
Utils::optional<LanguageServerProtocol::MessageId> m_currentRequest;
};