Revert "moved assert for Include-fixer to correct place"

This reverts commit 039ecf375d0d71524b1c3a904f93e57a10807b41.

Author: chomosuke

clang-tools-extra/clangd/Diagnostics.cpp

@@ -854,6 +854,8 @@ void StoreDiags::HandleDiagnostic(DiagnosticsEngine::Level DiagLevel,
     if (Fixer) {
       auto ReplacementFixes = Fixer(*LastDiag, Info);
       if (!ReplacementFixes.empty()) {
+        assert(Info.getNumFixItHints() == 0 &&
+               "Include-fixer replaced a note with clang fix-its attached!");
         LastDiag->Fixes.insert(LastDiag->Fixes.end(), ReplacementFixes.begin(),
                                ReplacementFixes.end());
         return;

clang-tools-extra/clangd/ParsedAST.cpp

@@ -656,23 +656,16 @@ ParsedAST::build(llvm::StringRef Filename, const ParseInputs &Inputs,
               : Symbol::Include;
       FixIncludes.emplace(Filename, Inserter, *Inputs.Index,
                           /*IndexRequestLimit=*/5, Directive);
-      ASTDiags.contributeFixes([&FixIncludes,
-                                &CTContext](const Diag &Diag,
-                                            const clang::Diagnostic &Info) {
-        auto Fixes = std::vector<Fix>();
-
-        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;
-      });
+      ASTDiags.contributeFixes(
+          [&FixIncludes, &CTContext](const Diag &Diag,
+                                     const clang::Diagnostic &Info) {
+            auto Fixes = std::vector<Fix>();
+            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());
+            return Fixes;
+          });
       Clang->setExternalSemaSource(FixIncludes->unresolvedNameRecorder());
     }
   }