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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Change-Id: I397dde2f95f62eb4843c39dd861522ae63d7f2c9
This commit is contained in:
Eike Ziller
2023-09-20 10:43:54 +02:00
parent 189cf8054f 2f80ef7f23
commit 13c12f33e5
8 changed files with 216 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/clangcodemodel/clangdclient.cpp
View File

@@ -632,13 +632,14 @@ void ClangdClient::handleDiagnostics(const PublishDiagnosticsParams &params)
const int docVersion = documentVersion(uri);
if (params.version().value_or(docVersion) != docVersion)
return;
QList<CodeAction> allCodeActions;
for (const Diagnostic &diagnostic : params.diagnostics()) {
const ClangdDiagnostic clangdDiagnostic(diagnostic);
auto codeActions = clangdDiagnostic.codeActions();
if (codeActions && !codeActions->isEmpty()) {
for (CodeAction &action : *codeActions)
action.setDiagnostics({diagnostic});
LanguageClient::updateCodeActionRefactoringMarker(this, *codeActions, uri);
allCodeActions << *codeActions;
} else {
// We know that there's only one kind of diagnostic for which clangd has
// a quickfix tweak, so let's not be wasteful.
@@ -648,6 +649,8 @@ void ClangdClient::handleDiagnostics(const PublishDiagnosticsParams &params)
requestCodeActions(uri, diagnostic);
}
}
if (!allCodeActions.isEmpty())
LanguageClient::updateCodeActionRefactoringMarker(this, allCodeActions, uri);
}
void ClangdClient::handleDocumentOpened(TextDocument *doc)