Add list of detected compiler paths to IntelliSense config UI (#3708)

* editable select control for compilerPath field * set compiler path values * update comments and width * normalize path, update description
microsoft · May 30, 2019 · c60a2c6 · c60a2c6
1 parent 1f7c27d
commit c60a2c6
Show file tree

Hide file tree

Showing 4 changed files with 404 additions and 309 deletions.
diff --git a/Extension/src/LanguageServer/configurations.ts b/Extension/src/LanguageServer/configurations.ts
@@ -644,7 +644,9 @@ export class CppProperties {
                 if (this.parsePropertiesFile(false)) {
                     // Parse successful, show UI
                     if (this.settingsPanel === undefined) {
+                        let settings: CppSettings = new CppSettings(this.rootUri);
                         this.settingsPanel = new SettingsPanel();
+                        this.settingsPanel.setKnownCompilers(this.knownCompilers, settings.preferredPathSeparator);
                         this.settingsPanel.SettingsPanelActivated(() => this.onSettingsPanelActivated());
                         this.settingsPanel.ConfigValuesChanged(() => this.saveConfigurationUI());
                         this.disposables.push(this.settingsPanel);

diff --git a/Extension/src/LanguageServer/settingsPanel.ts b/Extension/src/LanguageServer/settingsPanel.ts
@@ -24,6 +24,7 @@ const elementId: { [key: string]: string } = {
 
 export class SettingsPanel {
     private configValues: config.Configuration;
+    private compilerPaths: string[] = [];
     private isIntelliSenseModeDefined: boolean = false;
     private settingsPanelActivated = new vscode.EventEmitter<void>();
     private configValuesChanged = new vscode.EventEmitter<void>();
@@ -103,6 +104,24 @@ export class SettingsPanel {
         }
     }
 
+    public setKnownCompilers(knownCompilers: config.KnownCompiler[], pathSeparator: string): void {
+        if (knownCompilers.length > 0) {
+            for (let compiler of knownCompilers) {
+                // Normalize path separators.
+                let path: string = compiler.path;
+                if (pathSeparator === "Forward Slash") {
+                    path = path.replace(/\\/g, '/');
+                } else {
+                    path = path.replace(/\//g, '\\');
+                }
+                // Do not add duplicate paths in case the default compilers for cpp and c are the same.
+                if (this.compilerPaths.indexOf(path) === -1) {
+                    this.compilerPaths.push(path);
+                }
+            }
+        }
+    }
+
     public updateErrors(errors: config.ConfigurationErrors): void {
         if (this.panel) {
             this.panel.webview.postMessage({ command: 'updateErrors', errors: errors});
@@ -138,9 +157,9 @@ export class SettingsPanel {
         this.configValues = Object.assign({}, configuration); // Copy configuration values
         this.isIntelliSenseModeDefined = (this.configValues.intelliSenseMode !== undefined);
         if (this.panel) {
-            // Send a message to the webview to update the values and errors
-           this.panel.webview.postMessage({ command: 'updateConfig', config: this.configValues});
-           this.panel.webview.postMessage({ command: 'updateErrors', errors: errors});
+            this.panel.webview.postMessage({ command: 'setKnownCompilers', compilers: this.compilerPaths});
+            this.panel.webview.postMessage({ command: 'updateConfig', config: this.configValues});
+            this.panel.webview.postMessage({ command: 'updateErrors', errors: errors});
         }
     }