Filtered NOLINT fix in ClangTidyRename test

Author: chomosuke

clang-tools-extra/clangd/Diagnostics.cpp

@@ -317,7 +317,7 @@ std::string mainMessage(const Diag &D, const ClangdDiagnosticOptions &Opts) {
   // the fixes is just to suppress could be misleading.
   int RealFixCount = D.Fixes.size();
   for (auto const &Fix : D.Fixes) {
-    if (isClangTidyNoLintFixes(Fix)) {
+    if (isNoLintFixes(Fix)) {
       RealFixCount--;
     }
   }

clang-tools-extra/clangd/NoLintFixes.cpp

@@ -39,7 +39,7 @@ namespace clang {
 namespace clangd {
 
 std::vector<Fix>
-clangTidyNoLintFixes(const clang::tidy::ClangTidyContext &CTContext,
+noLintFixes(const clang::tidy::ClangTidyContext &CTContext,
                      const clang::Diagnostic &Info, const Diag &Diag) {
   auto RuleName = CTContext.getCheckName(Diag.ID);
   if (
@@ -93,9 +93,9 @@ clangTidyNoLintFixes(const clang::tidy::ClangTidyContext &CTContext,
   return {F};
 }
 
-const auto MsgRegex = std::regex("ignore \\[.*\\] for this line");
-bool isClangTidyNoLintFixes(const Fix &F) {
-  return std::regex_match(F.Message, MsgRegex);
+const auto Regex = std::regex(NoLintFixMsgRegexStr);
+bool isNoLintFixes(const Fix &F) {
+  return std::regex_match(F.Message, Regex);
 }
 
 } // namespace clangd

clang-tools-extra/clangd/NoLintFixes.h

@@ -22,12 +22,13 @@ namespace clangd {
 
 /// Suggesting to insert "\\ NOLINTNEXTLINE(...)" to suppress clang-tidy
 /// diagnostics.
-std::vector<Fix>
-clangTidyNoLintFixes(const clang::tidy::ClangTidyContext &CTContext,
-                     const clang::Diagnostic &Info, const Diag &Diag);
+std::vector<Fix> noLintFixes(const clang::tidy::ClangTidyContext &CTContext,
+                             const clang::Diagnostic &Info, const Diag &Diag);
+
+const auto NoLintFixMsgRegexStr = std::string("ignore \\[.*\\] for this line");
 
 /// Check if a fix created by clangTidyNoLintFixes().
-bool isClangTidyNoLintFixes(const Fix &F);
+bool isNoLintFixes(const Fix &F);
 
 } // namespace clangd
 } // namespace clang

clang-tools-extra/clangd/ParsedAST.cpp

@@ -660,7 +660,7 @@ ParsedAST::build(llvm::StringRef Filename, const ParseInputs &Inputs,
           [&FixIncludes, &CTContext](const Diag &Diag,
                                      const clang::Diagnostic &Info) {
             auto Fixes = std::vector<Fix>();
-            auto NoLintFixes = clangTidyNoLintFixes(*CTContext, Info, Diag);
+            auto NoLintFixes = noLintFixes(*CTContext, Info, Diag);
             Fixes.insert(Fixes.end(), NoLintFixes.begin(), NoLintFixes.end());
             auto IncludeFixes = FixIncludes->fix(Diag.Severity, Info);
             Fixes.insert(Fixes.end(), IncludeFixes.begin(), IncludeFixes.end());

clang-tools-extra/clangd/unittests/ClangdLSPServerTests.cpp

@@ -15,6 +15,7 @@
 #include "FeatureModule.h"
 #include "LSPBinder.h"
 #include "LSPClient.h"
+#include "NoLintFixes.h"
 #include "TestFS.h"
 #include "support/Function.h"
 #include "support/Logger.h"
@@ -32,13 +33,15 @@
 #include "llvm/Testing/Support/SupportHelpers.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include <algorithm>
 #include <cassert>
 #include <condition_variable>
 #include <cstddef>
 #include <deque>
 #include <memory>
 #include <mutex>
 #include <optional>
+#include <regex>
 #include <thread>
 #include <utility>
 
@@ -222,7 +225,7 @@ TEST_F(LSPTest, ClangTidyRename) {
   ASSERT_TRUE(Diags && !Diags->empty());
   auto RenameDiag = Diags->front();
 
-  auto RenameCommand =
+  auto Fixes =
       (*Client
             .call("textDocument/codeAction",
                   llvm::json::Object{
@@ -232,9 +235,16 @@ TEST_F(LSPTest, ClangTidyRename) {
                            {"diagnostics", llvm::json::Array{RenameDiag}}}},
                       {"range", Source.range()}})
             .takeValue()
-            .getAsArray())[0];
+            .getAsArray());
+  const auto NoLintRegex = std::regex("Apply fix: " + NoLintFixMsgRegexStr);
+  const auto &RenameCommand = *std::find_if(
+      Fixes.begin(), Fixes.end(), [&](decltype(Fixes)::value_type &Fix) {
 
-  ASSERT_EQ((*RenameCommand.getAsObject())["title"], "change 'foo' to 'Foo'");
+        return !std::regex_match((*Fix.getAsObject())["title"].getAsString()->data(), NoLintRegex);
+      });
+
+  ASSERT_EQ((*RenameCommand.getAsObject()).get("title")->getAsString(),
+            "change 'foo' to 'Foo'");
 
   Client.expectServerCall("workspace/applyEdit");
   Client.call("workspace/executeCommand", RenameCommand);