clangd: Set a diagnostic on a code action resulting from a tweak
... if there is a match.
This is needed to that clients can can make a connection between a
diagnostic and an associated quickfix-tweak.
Ideally, quickfix-kind tweak code actions would be provided inline along
with the non-tweak fixes, but this doesn't seem easily achievable.
Reviewed By: sammccall
Differential Revision: https://reviews.llvm.org/D118976
diff --git a/clang-tools-extra/clangd/ClangdLSPServer.cpp b/clang-tools-extra/clangd/ClangdLSPServer.cpp
index 8bd95b0..0ec2052 100644
--- a/clang-tools-extra/clangd/ClangdLSPServer.cpp
+++ b/clang-tools-extra/clangd/ClangdLSPServer.cpp
@@ -986,8 +986,8 @@
// Now enumerate the semantic code actions.
auto ConsumeActions =
- [Reply = std::move(Reply), File, Selection = Params.range,
- FixIts = std::move(FixIts), this](
+ [Diags = Params.context.diagnostics, Reply = std::move(Reply), File,
+ Selection = Params.range, FixIts = std::move(FixIts), this](
llvm::Expected<std::vector<ClangdServer::TweakRef>> Tweaks) mutable {
if (!Tweaks)
return Reply(Tweaks.takeError());
@@ -1003,13 +1003,17 @@
for (auto &Action : Actions) {
if (Action.kind && *Action.kind == CodeAction::QUICKFIX_KIND) {
if (OnlyFix) {
- OnlyFix->isPreferred = false;
+ OnlyFix = nullptr;
break;
}
- Action.isPreferred = true;
OnlyFix = &Action;
}
}
+ if (OnlyFix) {
+ OnlyFix->isPreferred = true;
+ if (Diags.size() == 1 && Diags.front().range == Selection)
+ OnlyFix->diagnostics = {Diags.front()};
+ }
if (SupportsCodeAction)
return Reply(llvm::json::Array(Actions));
