maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Christian Kandeler 2022-02-10 15:51:29 +01:00 committed by Kadir Cetinkaya
parent e34623b165
commit bd6c6974f5
No known key found for this signature in database
GPG Key ID: E39E36B8D2057ED6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang-tools-extra/clangd/ClangdLSPServer.cpp
View File

@ -986,8 +986,8 @@ void ClangdLSPServer::onCodeAction(const CodeActionParams &Params,
// 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 @@ void ClangdLSPServer::onCodeAction(const CodeActionParams &Params,
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));