Apply mergeConfigurations for browse.path, auto-update the config, and avoid accumulating old configs#13678
Merged
sean-mcmanus merged 7 commits intoJun 13, 2025
mainmicrosoft/vscode-cpptools:mainfrom
seanmcm/applyMergeConfigurationsForBrowsePathmicrosoft/vscode-cpptools:seanmcm/applyMergeConfigurationsForBrowsePathCopy head branch name to clipboard
Merged
Apply mergeConfigurations for browse.path, auto-update the config, and avoid accumulating old configs#13678sean-mcmanus merged 7 commits intomainmicrosoft/vscode-cpptools:mainfrom seanmcm/applyMergeConfigurationsForBrowsePathmicrosoft/vscode-cpptools:seanmcm/applyMergeConfigurationsForBrowsePathCopy head branch name to clipboard
sean-mcmanus merged 7 commits into
mainmicrosoft/vscode-cpptools:mainfrom
seanmcm/applyMergeConfigurationsForBrowsePathmicrosoft/vscode-cpptools:seanmcm/applyMergeConfigurationsForBrowsePathCopy head branch name to clipboard
Conversation
sean-mcmanus
commented
Jun 10, 2025
sean-mcmanus
commented
Jun 10, 2025
sean-mcmanus
commented
Jun 10, 2025
Colengms
approved these changes
Jun 13, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fix for the configurationProvider case of #13660, #13687, and #13688 (the changed mergeable property isn't auto-updated and old config values are accumulated). #13689 is not fixed.
Also, updated the description of mergeConfigurations.
Also, removed the "string" type for mergeConfigurations, since that appears to be invalid.
mergeConfigurations currently is not used by compileCommands (so that behavior is unchanged and has browse.path merged, but other properties not merged unless there is a fallback from a file not configured from compileCommands).