Apply mergeConfigurations for browse.path, auto-update the config, and avoid accumulating old configs #13678
+104
−28
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
sean-mcmanus
changed the title
sean-mcmanus
commented
Jun 10, 2025
| @@ -841,6 +841,7 @@ | |||
| }, | |||
| "C_Cpp.default.mergeConfigurations": { | |||
| "type": "boolean", | |||
| "default": false, | |||
There was a problem hiding this comment.
The "false" was already implicitly being used as the default, so setting it to false here just made it explicit was already being used as the default.
sean-mcmanus
commented
Jun 10, 2025
| @@ -2181,6 +2186,7 @@ export class DefaultClient implements Client { | |||
| if (configs && configs.length > 0 && configs[0]) { | |||
| const fileConfiguration: configs.Configuration | undefined = this.configuration.CurrentConfiguration; | |||
| if (fileConfiguration?.mergeConfigurations) { | |||
| configs = deepCopy(configs); | |||
There was a problem hiding this comment.
This line change fixes the duplicates/old values being accumulated: #13687
sean-mcmanus
commented
Jun 10, 2025
| @@ -1810,3 +1810,21 @@ export function findExePathInArgs(args: CommandString[]): string | undefined { | |||
| export function getVsCodeVersion(): number[] { | |||
| return vscode.version.split('.').map(num => parseInt(num, undefined)); | |||
| } | |||
|
|
|||
| export function equals(array1: string[] | undefined, array2: string[] | undefined): boolean { | |||
There was a problem hiding this comment.
TypeScript confusingly was returning false with array1 == array2 even though the contents of the arrays were identical.
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.
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).