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

LSP: Fix TextDocumentEdit member name

Browse Source 
The VersionedTextDocumentIdentifier can be acccessed under textDocument
not id.

Change-Id: I9b3531532ed92885147525fa580c62d4b52f9c4b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2020-06-11 15:22:57 +02:00
parent 0575e1bbc2
commit 4766ad2d18
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/languageclient/languageclientutils.cpp
View File

@@ -81,9 +81,9 @@ bool applyTextDocumentEdit(const TextDocumentEdit &edit)
const QList<TextEdit> &edits = edit.edits();
if (edits.isEmpty())
return true;
const DocumentUri &uri = edit.id().uri();
const DocumentUri &uri = edit.textDocument().uri();
if (TextDocument* doc = TextDocument::textDocumentForFilePath(uri.toFilePath())) {
LanguageClientValue<int> version = edit.id().version();
LanguageClientValue<int> version = edit.textDocument().version();
if (!version.isNull() && version.value(0) < doc->document()->revision())
return false;
}
@@ -163,7 +163,7 @@ void updateCodeActionRefactoringMarker(Client *client,
if (optional<QList<TextDocumentEdit>> documentChanges = edit.documentChanges()) {
QList<TextDocumentEdit> changesForUri = Utils::filtered(
documentChanges.value(), [uri](const TextDocumentEdit &edit) {
return edit.id().uri() == uri;
return edit.textDocument().uri() == uri;
});
for (const TextDocumentEdit &edit : changesForUri)
edits << edit.edits();