Finish plugging into config UI

Author: Colengms

Extension/src/LanguageServer/settingsPanel.ts

@@ -52,6 +52,8 @@ const elementId: { [key: string]: string } = {
     mergeConfigurations: "mergeConfigurations",
     configurationProvider: "configurationProvider",
     forcedInclude: "forcedInclude",
+    recursiveIncludesReduce: "recursiveIncludes.reduce",
+    recursiveIncludesPriority: "recursiveIncludes.priority",
 
     // Browse properties
     browsePath: "browsePath",
@@ -351,6 +353,18 @@ export class SettingsPanel {
             case elementId.forcedInclude:
                 this.configValues.forcedInclude = splitEntries(message.value);
                 break;
+            case elementId.recursiveIncludesReduce:
+                if (!this.configValues.recursiveIncludes) {
+                    this.configValues.recursiveIncludes = {};
+                }
+                this.configValues.recursiveIncludes.reduce = message.value;
+                break;
+            case elementId.recursiveIncludesPriority:
+                if (!this.configValues.recursiveIncludes) {
+                    this.configValues.recursiveIncludes = {};
+                }
+                this.configValues.recursiveIncludes.priority = message.value;
+                break;
             case elementId.browsePath:
                 if (!this.configValues.browse) {
                     this.configValues.browse = {};

Extension/ui/settings.ts

@@ -42,6 +42,8 @@ const elementId: { [key: string]: string } = {
     mergeConfigurations: "mergeConfigurations",
     dotConfig: "dotConfig",
     dotConfigInvalid: "dotConfigInvalid",
+    recursiveIncludesReduce: "recursiveIncludes.reduce",
+    recursiveIncludesPriority: "recursiveIncludes.priority",
 
     // Browse properties
     browsePath: "browsePath",
@@ -103,6 +105,7 @@ class SettingsApp {
         // Special case for checkbox elements
         document.getElementById(elementId.limitSymbolsToIncludedHeaders)?.addEventListener("change", this.onChangedCheckbox.bind(this, elementId.limitSymbolsToIncludedHeaders));
         document.getElementById(elementId.mergeConfigurations)?.addEventListener("change", this.onChangedCheckbox.bind(this, elementId.mergeConfigurations));
+        document.getElementById(elementId.recursiveIncludesReduce)?.addEventListener("change", this.onChangedCheckbox.bind(this, elementId.recursiveIncludesReduce));
     }
 
     private addEventsToConfigNameChanges(): void {
@@ -300,6 +303,10 @@ class SettingsApp {
             (<HTMLInputElement>document.getElementById(elementId.configurationProvider)).value = config.configurationProvider ? config.configurationProvider : "";
             (<HTMLInputElement>document.getElementById(elementId.forcedInclude)).value = joinEntries(config.forcedInclude);
             (<HTMLInputElement>document.getElementById(elementId.dotConfig)).value = config.dotConfig ? config.dotConfig : "";
+            if (config.recursiveIncludes) {
+                (<HTMLInputElement>document.getElementById(elementId.recursiveIncludesReduce)).checked = config.recursiveIncludes.reduce;
+                (<HTMLInputElement>document.getElementById(elementId.recursiveIncludesPriority)).value = config.recursiveIncludes.priority;
+            }
 
             if (config.browse) {
                 (<HTMLInputElement>document.getElementById(elementId.browsePath)).value = joinEntries(config.browse.path);