caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[clangd] Consistent precedence between --header-insertion and HeaderInsertion (#146235)

Browse Source 
In PR #128503, the CLI option would take precedence over the config option
only if it was set to `never`. This commit ensures the CLI option always takes
precedence over the config option.
This commit is contained in:
Mythreya
2025-06-29 07:47:49 -07:00
committed by GitHub
parent f5ed863176
commit d2d5203bf4
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
clang-tools-extra/clangd/tool/ClangdMain.cpp
View File

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