fixup! [clangd] Add CodePatterns config option under Completion

Fix the #include preprocessor not autocompleting when CodePatterns is
set to None

Author: Noustaa

clang-tools-extra/clangd/CodeComplete.cpp

@@ -926,7 +926,8 @@ struct CompletionRecorder : public CodeCompleteConsumer {
     // FIXME: in case there is no future sema completion callback after the
     // recovery mode, we might still want to provide some results (e.g. trivial
     // identifier-based completion).
-    if (Context.getKind() == CodeCompletionContext::CCC_Recovery) {
+    CodeCompletionContext::Kind ContextKind = Context.getKind();
+    if (ContextKind == CodeCompletionContext::CCC_Recovery) {
       log("Code complete: Ignoring sema code complete callback with Recovery "
           "context.");
       return;
@@ -952,7 +953,8 @@ struct CompletionRecorder : public CodeCompleteConsumer {
       auto &Result = InResults[I];
       if (Config::current().Completion.CodePatterns ==
               Config::CodePatternsPolicy::None &&
-          Result.Kind == CodeCompletionResult::RK_Pattern)
+          Result.Kind == CodeCompletionResult::RK_Pattern &&
+          ContextKind != CodeCompletionContext::CCC_IncludedFile)
         continue;
       // Class members that are shadowed by subclasses are usually noise.
       if (Result.Hidden && Result.Declaration &&

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

@@ -3344,6 +3344,22 @@ TEST(CompletionTest, NoCodePatternsIfDisabled) {
               Not(Contains(kind(CompletionItemKind::Snippet))));
 }
 
+TEST(CompletionTest, CompleteIncludeIfCodePatternsNone) {
+  clangd::CodeCompleteOptions Opts = {};
+  Opts.EnableSnippets = true;
+  Opts.CodePatterns = Config::CodePatternsPolicy::None;
+
+  Annotations Test(R"cpp(#include "^)cpp");
+  auto TU = TestTU::withCode(Test.code());
+  TU.AdditionalFiles["foo/bar.h"] = "";
+  TU.ExtraArgs.push_back("-I" + testPath("foo"));
+
+  auto Results = completions(TU, Test.point(), {}, Opts);
+  EXPECT_THAT(Results.Completions,
+              AllOf(has("foo/", CompletionItemKind::Folder),
+                    has("bar.h\"", CompletionItemKind::File)));
+}
+
 TEST(CompletionTest, NoQualifierIfShadowed) {
   clangd::CodeCompleteOptions Opts = {};
   Opts.AllScopes = true;