changed withFix to containsFix in DiagnosticsTest to ignore NOLINT fix

Author: chomosuke

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

@@ -69,6 +69,11 @@ ::testing::Matcher<const Diag &> withFix(::testing::Matcher<Fix> FixMatcher1,
   return Field(&Diag::Fixes, UnorderedElementsAre(FixMatcher1, FixMatcher2));
 }
 
+::testing::Matcher<const Diag &>
+containsFix(::testing::Matcher<Fix> FixMatcher) {
+  return Field(&Diag::Fixes, Contains(FixMatcher));
+}
+
 ::testing::Matcher<const Diag &> withID(unsigned ID) {
   return Field(&Diag::ID, ID);
 }
@@ -1290,18 +1295,20 @@ TEST(IncludeFixerTest, IncompleteType) {
       {"call_incomplete_argument", "int m(ns::X); int i = m([[*x]]);"},
       {"switch_incomplete_class_type", "void a() { [[switch]](*x) {} }"},
       {"delete_incomplete_class_type", "void f() { [[delete]] *x; }"},
+      // TODO: Add to test case
       {"-Wdelete-incomplete", "void f() { [[delete]] x; }"},
       {"dereference_incomplete_type",
        R"cpp(void f() { asm("" : "=r"([[*]]x)::); })cpp"},
   };
   for (auto Case : Tests) {
     Annotations Main(Case.second);
     TU.Code = Main.code().str() + "\n // error-ok";
-    EXPECT_THAT(
-        TU.build().getDiagnostics(),
-        ElementsAre(AllOf(diagName(Case.first), hasRange(Main.range()),
-                          withFix(Fix(Range{}, "#include \"x.h\"\n",
-                                      "Include \"x.h\" for symbol ns::X")))))
+    // TODO: maybe only do containsFix on -Wdelete-incomplete
+    EXPECT_THAT(TU.build().getDiagnostics(),
+                ElementsAre(AllOf(
+                    diagName(Case.first), hasRange(Main.range()),
+                    containsFix(Fix(Range{}, "#include \"x.h\"\n",
+                                    "Include \"x.h\" for symbol ns::X")))))
         << Case.second;
   }
 }
@@ -1662,17 +1669,18 @@ TEST(IncludeFixerTest, HeaderNamedInDiag) {
                              "with type 'int (const char *, ...)'; ISO C99 "
                              "and later do not support implicit function "
                              "declarations"),
-          withFix(Fix(Test.range("insert"), "#include <stdio.h>\n",
-                      "Include <stdio.h> for symbol printf")))));
+          // TODO: Add to test case
+          containsFix(Fix(Test.range("insert"), "#include <stdio.h>\n",
+                          "Include <stdio.h> for symbol printf")))));
 
   TU.ExtraArgs = {"-xc", "-std=c89"};
   EXPECT_THAT(
       TU.build().getDiagnostics(),
       ElementsAre(AllOf(
           Diag(Test.range(), "implicitly declaring library function 'printf' "
                              "with type 'int (const char *, ...)'"),
-          withFix(Fix(Test.range("insert"), "#include <stdio.h>\n",
-                      "Include <stdio.h> for symbol printf")))));
+          containsFix(Fix(Test.range("insert"), "#include <stdio.h>\n",
+                          "Include <stdio.h> for symbol printf")))));
 }
 
 TEST(IncludeFixerTest, CImplicitFunctionDecl) {
@@ -1698,15 +1706,15 @@ TEST(IncludeFixerTest, CImplicitFunctionDecl) {
           Diag(Test.range(),
                "call to undeclared function 'foo'; ISO C99 and later do not "
                "support implicit function declarations"),
-          withFix(Fix(Range{}, "#include \"foo.h\"\n",
-                      "Include \"foo.h\" for symbol foo")))));
+          containsFix(Fix(Range{}, "#include \"foo.h\"\n",
+                          "Include \"foo.h\" for symbol foo")))));
 
   TU.ExtraArgs = {"-std=c89", "-Wall"};
   EXPECT_THAT(TU.build().getDiagnostics(),
               ElementsAre(AllOf(
                   Diag(Test.range(), "implicit declaration of function 'foo'"),
-                  withFix(Fix(Range{}, "#include \"foo.h\"\n",
-                              "Include \"foo.h\" for symbol foo")))));
+                  containsFix(Fix(Range{}, "#include \"foo.h\"\n",
+                                  "Include \"foo.h\" for symbol foo")))));
 }
 
 TEST(DiagsInHeaders, DiagInsideHeader) {
@@ -1930,10 +1938,10 @@ TEST(ParsedASTTest, ModuleSawDiag) {
   TestTU TU;
 
   auto AST = TU.build();
-        #if 0
+#if 0
   EXPECT_THAT(AST.getDiagnostics(),
               testing::Contains(Diag(Code.range(), KDiagMsg.str())));
-        #endif
+#endif
 }
 
 TEST(Preamble, EndsOnNonEmptyLine) {