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

LanguageClient: fix diagnostic document revision check

Browse Source 
We track the document revision in the client nowadays.

Change-Id: Ia55bc7cd5eaf100fb19953ca71e8de8f43ae3266
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
David Schulz
2021-06-22 15:28:35 +02:00
parent 44f0f9ae18
commit 922f9b159d
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/languageclient/diagnosticmanager.cpp
View File

@@ -25,6 +25,8 @@
#include "diagnosticmanager.h"
#include "client.h"
#include <coreplugin/editormanager/documentmodel.h>
#include <texteditor/fontsettings.h>
#include <texteditor/textdocument.h>
@@ -69,8 +71,8 @@ private:
const Diagnostic m_diagnostic;
};
DiagnosticManager::DiagnosticManager(const Id &clientId)
: m_clientId(clientId)
DiagnosticManager::DiagnosticManager(Client *client)
: m_client(client)
{}
DiagnosticManager::~DiagnosticManager()
@@ -95,7 +97,7 @@ void DiagnosticManager::hideDiagnostics(TextDocument *doc)
m_hideHandler();
for (BaseTextEditor *editor : BaseTextEditor::textEditorsForDocument(doc))
editor->editorWidget()->setExtraSelections(TextEditorWidget::CodeWarningsSelection, {});
qDeleteAll(Utils::filtered(doc->marks(), Utils::equal(&TextMark::category, m_clientId)));
qDeleteAll(Utils::filtered(doc->marks(), Utils::equal(&TextMark::category, m_client->id())));
}
void DiagnosticManager::removeDiagnostics(const LanguageServerProtocol::DocumentUri &uri)
@@ -141,7 +143,7 @@ void DiagnosticManager::showDiagnostics(const DocumentUri &uri, int version)
QObject::connect(action, &QAction::triggered, [text = diagnostic.message()]() {
QApplication::clipboard()->setText(text);
});
auto mark = new TextMark(filePath, diagnostic, m_clientId);
auto mark = new TextMark(filePath, diagnostic, m_client->id());
mark->setActions({action});
doc->addMark(mark);
@@ -164,7 +166,7 @@ void DiagnosticManager::clearDiagnostics()
QList<Diagnostic> DiagnosticManager::diagnosticsAt(const DocumentUri &uri,
const QTextCursor &cursor) const
{
const int documentRevision = cursor.document()->revision();
const int documentRevision = m_client->documentVersion(uri.toFilePath());
auto it = m_diagnostics.find(uri);
if (it == m_diagnostics.end())
return {};
@@ -184,7 +186,7 @@ bool DiagnosticManager::hasDiagnostic(const LanguageServerProtocol::DocumentUri
const auto it = m_diagnostics.find(uri);
if (it == m_diagnostics.end())
return {};
const int revision = doc->document()->revision();
const int revision = m_client->documentVersion(uri.toFilePath());
if (revision != it->version.value_or(revision))
return false;
return it->diagnostics.contains(diag);