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

LanguageClient: manually track document version

Browse Source 
Using the document revision causes issues for some servers.

Task-number: QTCREATORBUG-25766
Change-Id: Ic858e19c6fe39e57c9d3124913887aafee0a3cd0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2021-06-14 11:47:04 +02:00
parent 200723cf13
commit 439bb9c4ae
8 changed files with 35 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,15 +78,16 @@ ChangeSet editsToChangeSet(const QList<TextEdit> &edits, const QTextDocument *do
return changeSet;
}
bool applyTextDocumentEdit(const TextDocumentEdit &edit)
bool applyTextDocumentEdit(const Client *client, const TextDocumentEdit &edit)
{
const QList<TextEdit> &edits = edit.edits();
if (edits.isEmpty())
return true;
const DocumentUri &uri = edit.textDocument().uri();
if (TextDocument* doc = TextDocument::textDocumentForFilePath(uri.toFilePath())) {
const FilePath &filePath = uri.toFilePath();
if (TextDocument* doc = TextDocument::textDocumentForFilePath(filePath)) {
LanguageClientValue<int> version = edit.textDocument().version();
if (!version.isNull() && version.value(0) < doc->document()->revision())
if (!version.isNull() && version.value(0) < client->documentVersion(filePath))
return false;
}
return applyTextEdits(uri, edits);
@@ -120,14 +121,14 @@ void applyTextEdit(TextDocumentManipulatorInterface &manipulator,
}
}
bool applyWorkspaceEdit(const WorkspaceEdit &edit)
bool applyWorkspaceEdit(const Client *client, const WorkspaceEdit &edit)
{
bool result = true;
const QList<TextDocumentEdit> &documentChanges
= edit.documentChanges().value_or(QList<TextDocumentEdit>());
if (!documentChanges.isEmpty()) {
for (const TextDocumentEdit &documentChange : documentChanges)
result |= applyTextDocumentEdit(documentChange);
result |= applyTextDocumentEdit(client, documentChange);
} else {
const WorkspaceEdit::Changes &changes = edit.changes().value_or(WorkspaceEdit::Changes());
for (auto it = changes.cbegin(); it != changes.cend(); ++it)
@@ -164,8 +165,8 @@ void updateCodeActionRefactoringMarker(Client *client,
marker.tooltip = action.title();
if (action.edit().has_value()) {
WorkspaceEdit edit = action.edit().value();
marker.callback = [edit](const TextEditorWidget *) {
applyWorkspaceEdit(edit);
marker.callback = [client, edit](const TextEditorWidget *) {
applyWorkspaceEdit(client, edit);
};
if (diagnostics.isEmpty()) {
QList<TextEdit> edits;