fixup! [clangd] Add CodePatterns config option under Completion

Remove the CLI option

Author: Noustaa

clang-tools-extra/clangd/ConfigFragment.h

@@ -350,7 +350,6 @@ struct Fragment {
     ///   "Never": Never insert headers
     std::optional<Located<std::string>> HeaderInsertion;
     /// Will suggest code patterns & snippets.
-    /// CLI option available '--code-patterns':
     /// Values are Config::CodePatternsPolicy:
     ///   all  => enable all code patterns and snippets suggestion
     ///   none => disable all code patterns and snippets suggestion

clang-tools-extra/clangd/tool/ClangdMain.cpp

@@ -267,17 +267,6 @@ opt<Config::HeaderInsertionPolicy> HeaderInsertion{
             "Never insert #include directives as part of code completion")),
 };
 
-opt<Config::CodePatternsPolicy> CodePatterns{
-    "code-patterns",
-    cat(Features),
-    desc("Code completion menu will suggest code patterns and snippets."),
-    init(CodeCompleteOptions().CodePatterns),
-    values(clEnumValN(Config::CodePatternsPolicy::All, "all",
-                      "Enable all code patterns and snippets."),
-           clEnumValN(Config::CodePatternsPolicy::None, "none",
-                      "Disable all code patterns and snippets.")),
-};
-
 opt<bool> ImportInsertions{
     "import-insertions",
     cat(Features),
@@ -680,7 +669,6 @@ class FlagsConfigProvider : public config::Provider {
     std::optional<Config::BackgroundPolicy> BGPolicy;
     std::optional<Config::ArgumentListsPolicy> ArgumentLists;
     std::optional<Config::HeaderInsertionPolicy> HeaderInsertionPolicy;
-    std::optional<Config::CodePatternsPolicy> CodePatternsPolicy;
 
     // If --compile-commands-dir arg was invoked, check value and override
     // default path.
@@ -735,10 +723,6 @@ class FlagsConfigProvider : public config::Provider {
                               : Config::ArgumentListsPolicy::Delimiters;
     }
 
-    if (CodePatterns == Config::CodePatternsPolicy::None) {
-      CodePatternsPolicy = Config::CodePatternsPolicy::None;
-    }
-
     Frag = [=](const config::Params &, Config &C) {
       if (CDBSearch)
         C.CompileFlags.CDBSearch = *CDBSearch;
@@ -752,8 +736,6 @@ class FlagsConfigProvider : public config::Provider {
         C.Completion.HeaderInsertion = *HeaderInsertionPolicy;
       if (AllScopesCompletion.getNumOccurrences())
         C.Completion.AllScopes = AllScopesCompletion;
-      if (CodePatternsPolicy)
-        C.Completion.CodePatterns = *CodePatternsPolicy;
 
       if (Test)
         C.Index.StandardLibrary = false;
@@ -967,7 +949,6 @@ clangd accepts flags on the commandline, and in the CLANGD_FLAGS environment var
     Opts.CodeComplete.BundleOverloads = CompletionStyle != Detailed;
   Opts.CodeComplete.ShowOrigins = ShowOrigins;
   Opts.CodeComplete.InsertIncludes = HeaderInsertion;
-  Opts.CodeComplete.CodePatterns = CodePatterns;
   Opts.CodeComplete.ImportInsertions = ImportInsertions;
   if (!HeaderInsertionDecorators) {
     Opts.CodeComplete.IncludeIndicator.Insert.clear();