[clangd] --header-insertion CLI fix
#146235
Merged
+2
−8
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In PR llvm#128503, CLI option overwrites only if it was set to `never`. This commit ensures that CLI options always overwrite any config option.
|
@llvm/pr-subscribers-clang-tools-extra Author: Mythreya (MythreyaK) ChangesIn PR #128503, CLI option overwrites only if it was set to Thanks to the fix from @HighCommander4 here! Full diff: https://github.com/llvm/llvm-project/pull/146235.diff 1 Files Affected:
diff --git a/clang-tools-extra/clangd/tool/ClangdMain.cpp b/clang-tools-extra/clangd/tool/ClangdMain.cpp
index b11d194da04db..f287439f10cab 100644
--- a/clang-tools-extra/clangd/tool/ClangdMain.cpp
+++ b/clang-tools-extra/clangd/tool/ClangdMain.cpp
@@ -668,7 +668,6 @@ class FlagsConfigProvider : public config::Provider {
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 @@ 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 == 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 @@ class FlagsConfigProvider : public config::Provider {
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;
|
|
@llvm/pr-subscribers-clangd Author: Mythreya (MythreyaK) ChangesIn PR #128503, CLI option overwrites only if it was set to Thanks to the fix from @HighCommander4 here! Full diff: https://github.com/llvm/llvm-project/pull/146235.diff 1 Files Affected:
diff --git a/clang-tools-extra/clangd/tool/ClangdMain.cpp b/clang-tools-extra/clangd/tool/ClangdMain.cpp
index b11d194da04db..f287439f10cab 100644
--- a/clang-tools-extra/clangd/tool/ClangdMain.cpp
+++ b/clang-tools-extra/clangd/tool/ClangdMain.cpp
@@ -668,7 +668,6 @@ class FlagsConfigProvider : public config::Provider {
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 @@ 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 == 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 @@ class FlagsConfigProvider : public config::Provider {
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;
|
|
I tested these locally and seems to work as expected. Please do double-check, just in case I missed something!
|
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/23/builds/11723 Here is the relevant piece of the build log for the reference |
rlavaee
pushed a commit
to rlavaee/llvm-project
that referenced
this pull request
Jul 1, 2025
…erInsertion` (llvm#146235) In PR llvm#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.
rlavaee
pushed a commit
to rlavaee/llvm-project
that referenced
this pull request
Jul 1, 2025
…erInsertion` (llvm#146235) In PR llvm#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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In PR #128503, CLI option overwrites only if it was set to
never. This commit ensures that CLI options always overwrite any config option.Thanks to the fix from @HighCommander4 here!