Address review comments

Author: MythreyaK

clang-tools-extra/clangd/ClangdServer.cpp

@@ -455,7 +455,8 @@ void ClangdServer::codeComplete(PathRef File, Position Pos,
     CodeCompleteOpts.MainFileSignals = IP->Signals;
     CodeCompleteOpts.AllScopes = Config::current().Completion.AllScopes;
     CodeCompleteOpts.ArgumentLists = Config::current().Completion.ArgumentLists;
-    CodeCompleteOpts.InsertIncludes = Config::current().HeaderInsertion.Policy;
+    CodeCompleteOpts.InsertIncludes =
+        Config::current().Completion.HeaderInsertion;
     // FIXME(ibiryukov): even if Preamble is non-null, we may want to check
     // both the old and the new version in case only one of them matches.
     CodeCompleteResult Result = clangd::codeComplete(

clang-tools-extra/clangd/Config.h

@@ -147,24 +147,22 @@ struct Config {
     FullPlaceholders,
   };
 
+  enum class HeaderInsertionPolicy {
+    IWYU,       // Include what you use
+    NeverInsert // Never insert headers as part of code completion
+  };
+
   /// Configures code completion feature.
   struct {
     /// Whether code completion includes results that are not visible in current
     /// scopes.
     bool AllScopes = true;
     /// controls the completion options for argument lists.
     ArgumentListsPolicy ArgumentLists = ArgumentListsPolicy::FullPlaceholders;
+    /// Controls if headers should be inserted when completions are accepted
+    HeaderInsertionPolicy HeaderInsertion = HeaderInsertionPolicy::IWYU;
   } Completion;
 
-  enum class HeaderInsertionPolicy {
-    IWYU,       // Include what you use
-    NeverInsert // Never insert headers as part of code completion
-  };
-
-  struct {
-    HeaderInsertionPolicy Policy = HeaderInsertionPolicy::IWYU;
-  } HeaderInsertion;
-
   /// Configures hover feature.
   struct {
     /// Whether hover show a.k.a type.

clang-tools-extra/clangd/ConfigCompile.cpp

@@ -705,7 +705,7 @@ struct FragmentCompiler {
                   .map("Never", Config::HeaderInsertionPolicy::NeverInsert)
                   .value())
         Out.Apply.push_back([Val](const Params &, Config &C) {
-          C.HeaderInsertion.Policy = *Val;
+          C.Completion.HeaderInsertion = *Val;
         });
     }
   }

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

@@ -668,6 +668,7 @@ class FlagsConfigProvider : public config::Provider {
     std::optional<Config::ExternalIndexSpec> IndexSpec;
     std::optional<Config::BackgroundPolicy> BGPolicy;
     std::optional<Config::ArgumentListsPolicy> ArgumentLists;
+    std::optional<Config::HeaderInsertionPolicy> _HeaderInsertion;
 
     // If --compile-commands-dir arg was invoked, check value and override
     // default path.
@@ -712,6 +713,11 @@ class FlagsConfigProvider : public config::Provider {
       BGPolicy = Config::BackgroundPolicy::Skip;
     }
 
+    // If CLI has set never, use that regardless of what the config files have
+    if (HeaderInsertion == CodeCompleteOptions::IncludeInsertion::NeverInsert) {
+      _HeaderInsertion = CodeCompleteOptions::IncludeInsertion::NeverInsert;
+    }
+
     if (std::optional<bool> Enable = shouldEnableFunctionArgSnippets()) {
       ArgumentLists = *Enable ? Config::ArgumentListsPolicy::FullPlaceholders
                               : Config::ArgumentListsPolicy::Delimiters;
@@ -726,6 +732,8 @@ class FlagsConfigProvider : public config::Provider {
         C.Index.Background = *BGPolicy;
       if (ArgumentLists)
         C.Completion.ArgumentLists = *ArgumentLists;
+      if (_HeaderInsertion)
+        C.Completion.HeaderInsertion = *_HeaderInsertion;
       if (AllScopesCompletion.getNumOccurrences())
         C.Completion.AllScopes = AllScopesCompletion;