Configuration UI

Extension/package.json

@@ -500,8 +500,13 @@
         "category": "C/C++"
       },
       {
-        "command": "C_Cpp.ConfigurationEdit",
-        "title": "%c_cpp.command.configurationEdit.title%",
+        "command": "C_Cpp.ConfigurationEditJSON",
+        "title": "%c_cpp.command.configurationEditJSON.title%",
+        "category": "C/C++"
+      },
+      {
+        "command": "C_Cpp.ConfigurationEditUI",
+        "title": "%c_cpp.command.configurationEditUI.title%",
         "category": "C/C++"
       },
       {

Extension/package.nls.it.json

@@ -1,7 +1,8 @@
 {
     "c_cpp.command.configurationSelect.title": "Scegli una configurazione...",
     "c_cpp.command.configurationProviderSelect.title": "Cambia provider configurazioni...",
-    "c_cpp.command.configurationEdit.title": "Modifica configurazioni...",
+    "c_cpp.command.configurationEditJSON.title": "Modifica configurazioni... (JSON)",
+    "c_cpp.command.configurationEditUI.title": "Modifica configurazioni... (UI)",
     "c_cpp.command.goToDeclaration.title": "Vai a dichiarazione",
     "c_cpp.command.peekDeclaration.title": "Visualizza dichiarazione",
     "c_cpp.command.switchHeaderSource.title": "Visualizza Header/Sorgente",

Extension/package.nls.json

@@ -1,7 +1,8 @@
 {
     "c_cpp.command.configurationSelect.title": "Select a configuration...",
     "c_cpp.command.configurationProviderSelect.title": "Change configuration provider...",
-    "c_cpp.command.configurationEdit.title": "Edit configurations...",
+    "c_cpp.command.configurationEditJSON.title": "Edit configurations... (JSON)",
+    "c_cpp.command.configurationEditUI.title": "Edit configurations... (UI)",
     "c_cpp.command.goToDeclaration.title": "Go to Declaration",
     "c_cpp.command.peekDeclaration.title": "Peek Declaration",
     "c_cpp.command.switchHeaderSource.title": "Switch Header/Source",

Extension/package.nls.zh-cn.json

@@ -1,7 +1,8 @@
 {
     "c_cpp.command.configurationSelect.title": "选择配置...",
     "c_cpp.command.configurationProviderSelect.title": "更换配置提供程序...",
-    "c_cpp.command.configurationEdit.title": "编辑配置...",
+    "c_cpp.command.configurationEditJSON.title": "编辑配置... (JSON)",
+    "c_cpp.command.configurationEditUI.title": "编辑配置... (UI)",
     "c_cpp.command.goToDeclaration.title": "跳转到声明",
     "c_cpp.command.peekDeclaration.title": "查看声明",
     "c_cpp.command.switchHeaderSource.title": "切换头文件/源文件",

Extension/src/LanguageServer/client.ts

@@ -224,6 +224,8 @@ export interface Client {
     handleConfigurationProviderSelectCommand(): void;
     handleShowParsingCommands(): void;
     handleConfigurationEditCommand(): void;
+    handleConfigurationEditJSONCommand(): void;
+    handleConfigurationEditUICommand(): void;
     handleAddToIncludePathCommand(path: string): void;
     onInterval(): void;
     dispose(): Thenable<void>;
@@ -962,22 +964,31 @@ class DefaultClient implements Client {
             let showIntelliSenseFallbackMessage: PersistentState<boolean> = new PersistentState<boolean>("CPP.showIntelliSenseFallbackMessage", true);
             if (showIntelliSenseFallbackMessage.Value) {
                 ui.showConfigureIncludePathMessage(() => {
-                    let learnMorePanel: string = "Configuration Help";
+                    let configJSON: string = "Configure (JSON)";
+                    let configUI: string = "Configure (UI)";
                     let dontShowAgain: string = "Don't Show Again";
                     let fallbackMsg: string = this.configuration.VcpkgInstalled ?
-                        "Update your IntelliSense settings or use Vcpkg to install libraries to help find missing headers." :
-                        "Configure your IntelliSense settings to help find missing headers.";
-                    return vscode.window.showInformationMessage(fallbackMsg, learnMorePanel, dontShowAgain).then((value) => {
+                        "Update your IntelliSense settings in JSON or UI. Or use Vcpkg to install libraries to help find missing headers." :
+                        "Configure your IntelliSense settings in JSON or UI to help find missing headers.";
+                    return vscode.window.showInformationMessage(fallbackMsg, configJSON, configUI, dontShowAgain).then((value) => {
                         switch (value) {
-                            case learnMorePanel:
-                                let uri: vscode.Uri = vscode.Uri.parse(`https://go.microsoft.com/fwlink/?linkid=864631`);
-                                vscode.commands.executeCommand('vscode.open', uri);
+                            case configJSON:
+                                vscode.commands.getCommands(true).then((commands: string[]) => {
+                                    if (commands.indexOf("workbench.action.problems.focus") >= 0) {
+                                         vscode.commands.executeCommand("workbench.action.problems.focus");
+                                   }
+                                });
+                                this.handleConfigurationEditJSONCommand();
+                                telemetry.logLanguageServerEvent("SettingsCommand", { "toast": "json" }, null);
+                                break;
+                            case configUI:
                                 vscode.commands.getCommands(true).then((commands: string[]) => {
                                     if (commands.indexOf("workbench.action.problems.focus") >= 0) {
                                         vscode.commands.executeCommand("workbench.action.problems.focus");
-                                    }
+                                }
                                 });
-                                this.handleConfigurationEditCommand();
+                                this.handleConfigurationEditUICommand();
+                                telemetry.logLanguageServerEvent("SettingsCommand", { "toast": "ui" }, null);
                                 break;
                             case dontShowAgain:
                                 showIntelliSenseFallbackMessage.Value = false;
@@ -1320,6 +1331,14 @@ class DefaultClient implements Client {
         this.notifyWhenReady(() => this.configuration.handleConfigurationEditCommand(vscode.window.showTextDocument));
     }
 
+    public handleConfigurationEditJSONCommand(): void {
+        this.notifyWhenReady(() => this.configuration.handleConfigurationEditJSONCommand(vscode.window.showTextDocument));
+    }
+
+    public handleConfigurationEditUICommand(): void {
+        this.notifyWhenReady(() => this.configuration.handleConfigurationEditUICommand(vscode.window.showTextDocument));
+    }
+
     public handleAddToIncludePathCommand(path: string): void {
         this.notifyWhenReady(() => this.configuration.addToIncludePathCommand(path));
     }
@@ -1403,6 +1422,8 @@ class NullClient implements Client {
     handleConfigurationProviderSelectCommand(): void {}
     handleShowParsingCommands(): void {}
     handleConfigurationEditCommand(): void {}
+    handleConfigurationEditJSONCommand(): void {}
+    handleConfigurationEditUICommand(): void {}
     handleAddToIncludePathCommand(path: string): void {}
     onInterval(): void {}
     dispose(): Thenable<void> {