better deal with converting fixes to rename while avoiding NoLint fixes

Author: chomosuke

clang-tools-extra/clangd/ClangdServer.cpp

@@ -15,6 +15,7 @@
 #include "Format.h"
 #include "HeaderSourceSwitch.h"
 #include "InlayHints.h"
+#include "NoLintFixes.h"
 #include "ParsedAST.h"
 #include "Preamble.h"
 #include "Protocol.h"
@@ -62,8 +63,8 @@ namespace clangd {
 namespace {
 
 // Tracks number of times a tweak has been offered.
-static constexpr trace::Metric TweakAvailable(
-    "tweak_available", trace::Metric::Counter, "tweak_id");
+static constexpr trace::Metric
+    TweakAvailable("tweak_available", trace::Metric::Counter, "tweak_id");
 
 // Update the FileIndex with new ASTs and plumb the diagnostics responses.
 struct UpdateIndexCallbacks : public ParsingCallbacks {
@@ -661,7 +662,7 @@ tryConvertToRename(const Diag *Diag, const Fix &Fix) {
   bool IsClangTidyRename = Diag->Source == Diag::ClangTidy &&
                            Diag->Name == "readability-identifier-naming" &&
                            !Fix.Edits.empty();
-  if (IsClangTidyRename && Diag->InsideMainFile) {
+  if (IsClangTidyRename && !isNoLintFixes(Fix) && Diag->InsideMainFile) {
     ClangdServer::CodeActionResult::Rename R;
     R.NewName = Fix.Edits.front().newText;
     R.FixMessage = Fix.Message;
@@ -701,21 +702,14 @@ void ClangdServer::codeAction(const CodeActionInputs &Params,
         return nullptr;
       };
       for (const auto &DiagRef : Params.Diagnostics) {
-        if (const auto *Diag = FindMatchedDiag(DiagRef)) {
-          auto It = Diag->Fixes.begin();
-          if (It != Diag->Fixes.end()) {
-            if (auto Rename = tryConvertToRename(Diag, *It)) {
-              // Only try to convert the first Fix to rename as subsequent Fixes
-              // might be "ignore [readability-identifier-naming] for this
-              // line".
+        if (const auto *Diag = FindMatchedDiag(DiagRef))
+          for (const auto &Fix : Diag->Fixes) {
+            if (auto Rename = tryConvertToRename(Diag, Fix)) {
               Result.Renames.emplace_back(std::move(*Rename));
-              It++;
+            } else {
+              Result.QuickFixes.push_back({DiagRef, Fix});
             }
           }
-          for (; It != Diag->Fixes.end(); It++) {
-            Result.QuickFixes.push_back({DiagRef, *It});
-          }
-        }
       }
     }
 

clang-tools-extra/clangd/ParsedAST.cpp

@@ -660,16 +660,17 @@ ParsedAST::build(llvm::StringRef Filename, const ParseInputs &Inputs,
                                 &CTContext](const Diag &Diag,
                                             const clang::Diagnostic &Info) {
         auto Fixes = std::vector<Fix>();
-        auto IncludeFixes = FixIncludes->fix(Diag.Severity, Info);
 
+        auto IncludeFixes = FixIncludes->fix(Diag.Severity, Info);
         // Ensures that if clang later introduces its own fix-it for includes it
         // will get on our radar.
         assert((IncludeFixes.empty() || Info.getNumFixItHints() == 0) &&
                "Include-fixer replaced a note with clang fix-its attached!");
-
         Fixes.insert(Fixes.end(), IncludeFixes.begin(), IncludeFixes.end());
+
         auto NoLintFixes = noLintFixes(*CTContext, Info, Diag);
         Fixes.insert(Fixes.end(), NoLintFixes.begin(), NoLintFixes.end());
+
         return Fixes;
       });
       Clang->setExternalSemaSource(FixIncludes->unresolvedNameRecorder());