Fix "console" squiggle with "cppdbg". (#7051)

* Fix "console" squiggle with "cppdbg". * Change "default"
microsoft · Feb 25, 2021 · 9e7b2d6 · 9e7b2d6
1 parent 2199ec3
commit 9e7b2d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Extension/package.json b/Extension/package.json
@@ -2004,7 +2004,7 @@
                   "%c_cpp.debuggers.cppvsdbg.console.newExternalWindow.description%"
                 ],
                 "description": "%c_cpp.debuggers.cppvsdbg.console.description%",
-                "default": "externalTerminal"
+                "default": "internalConsole"
               },
               "sourceFileMap": {
                 "type": "object",

diff --git a/Extension/src/Debugger/configurationProvider.ts b/Extension/src/Debugger/configurationProvider.ts
@@ -182,7 +182,11 @@ class CppConfigurationProvider implements vscode.DebugConfigurationProvider {
 
             newConfig.name = compilerName + buildAndDebugActiveFileStr();
             newConfig.preLaunchTask = task.name;
-            newConfig.console = "externalTerminal";
+            if (newConfig.type === "cppdbg") {
+                newConfig.externalConsole = false;
+            } else {
+                newConfig.console = "externalTerminal";
+            }
             const exeName: string = path.join("${fileDirname}", "${fileBasenameNoExtension}");
             const isWindows: boolean = platform === 'win32';
             newConfig.program = isWindows ? exeName + ".exe" : exeName;

diff --git a/Extension/src/Debugger/configurations.ts b/Extension/src/Debugger/configurations.ts
@@ -44,7 +44,7 @@ function createLaunchString(name: string, type: string, executable: string): str
 "stopAtEntry": false,
 "cwd": "$\{workspaceFolder\}",
 "environment": [],
-"console": "externalTerminal"
+${ type === "cppdbg" ? `"externalConsole": false` : `"console": "externalTerminal"` }
 `;
 }