Apply mergeConfigurations for browse.path.

Author: sean-mcmanus

Extension/c_cpp_properties.schema.json

@@ -180,12 +180,9 @@
                         "type": "string"
                     },
                     "mergeConfigurations": {
-                        "markdownDescription": "Set to `true` to merge include paths, defines, and forced includes with those from a configuration provider.",
-                        "descriptionHint": "Markdown text between `` should not be translated or localized (they represent literal text) and the capitalization, spacing, and punctuation (including the ``) should not be altered.",
-                        "type": [
-                            "boolean",
-                            "string"
-                        ]
+                        "markdownDescription": "Set to `true` to merge `includePath`, `defines`, `forcedInclude`, and `browse.path` with those received from the configuration provider. Changes to `mergeConfigurations` won't take effect until the configuration provider resends the configuration.",
+                        "descriptionHint": "{Locked=\"`true`\"} {Locked=\"`includePath`\"} {Locked=\"`defines`\"} {Locked=\"`forcedInclude`\"} {Locked=\"`browsePath`\"} {Locked=\"`mergeConfigurations`\"}",
+                        "type": "boolean"
                     },
                     "browse": {
                         "type": "object",

Extension/src/LanguageServer/client.ts

@@ -244,6 +244,7 @@ interface CustomConfigurationParams extends WorkspaceFolderParams {
 
 interface CustomBrowseConfigurationParams extends WorkspaceFolderParams {
     browseConfiguration: InternalWorkspaceBrowseConfiguration;
+    mergeConfigurations: boolean;
 }
 
 interface CompileCommandsPaths extends WorkspaceFolderParams {
@@ -3349,7 +3350,8 @@ export class DefaultClient implements Client {
 
         const params: CustomBrowseConfigurationParams = {
             browseConfiguration: sanitized,
-            workspaceFolderUri: this.RootUri?.toString()
+            workspaceFolderUri: this.RootUri?.toString(),
+            mergeConfigurations: this.configuration.CurrentConfiguration?.mergeConfigurations ?? false
         };
 
         void this.languageClient.sendNotification(CustomBrowseConfigurationNotification, params).catch(logAndReturn.undefined);

Extension/src/LanguageServer/configurations.ts

@@ -83,7 +83,7 @@ export interface Configuration {
     forcedInclude?: string[];
     configurationProviderInCppPropertiesJson?: string;
     configurationProvider?: string;
-    mergeConfigurations?: boolean | string;
+    mergeConfigurations?: boolean;
     browse?: Browse;
     recursiveIncludes?: RecursiveIncludes;
     customConfigurationVariables?: { [key: string]: string };

Extension/ui/settings.html

@@ -687,7 +687,7 @@
             <div class="section-title" data-loc-id="merge.configurations">Merge configurations</div>
             <div>
                 <input type="checkbox" id="mergeConfigurations" style="vertical-align: middle; transform: scale(1.5)">
-                    <span data-loc-id="merge.configurations.description">When <code>true</code> (or checked), merge include paths, defines, and forced includes with those from a configuration provider.</span>
+                    <span data-loc-id="merge.configurations.description">When <code>true</code> (or checked), merge <code>includePath</code>, <code>defines</code>, <code>forcedInclude</code>, and <code>browse.path</code> with those received from the configuration provider. Changes to <code>mergeConfigurations</code> won't take effect until the the configuration provider resends the configuration.</span>
                 </input>
             </div>
         </div>