reinterpret internalConsole to be integratedTerminal

Author: bobbrow

Extension/src/Debugger/configurations.ts

@@ -97,7 +97,7 @@ function createLaunchString(name: string, type: string, executable: string): str
 "stopAtEntry": false,
 "cwd": "$\{fileDirname\}",
 "environment": [],
-${ type === "cppdbg" ? `"externalConsole": false` : `"console": "integratedTerminal"` }
+${type === "cppdbg" ? `"externalConsole": false` : `"console": "internalConsole"`}
 `;
 }
 
@@ -164,7 +164,7 @@ export class MIConfigurations extends Configuration {
 \t${indentJsonString(createLaunchString(name, this.miDebugger, this.executable))},
 \t"MIMode": "${this.MIMode}"{0}{1}
 }`, [this.miDebugger === "cppdbg" && os.platform() === "win32" ? `,${os.EOL}\t"miDebuggerPath": "/path/to/gdb"` : "",
-            this.additionalProperties ? `,${os.EOL}\t${indentJsonString(this.additionalProperties)}` : ""]);
+        this.additionalProperties ? `,${os.EOL}\t${indentJsonString(this.additionalProperties)}` : ""]);
 
         return {
             "label": configPrefix + name,
@@ -182,7 +182,7 @@ export class MIConfigurations extends Configuration {
 \t${indentJsonString(createAttachString(name, this.miDebugger, this.executable))}
 \t"MIMode": "${this.MIMode}"{0}{1}
 }`, [this.miDebugger === "cppdbg" && os.platform() === "win32" ? `,${os.EOL}\t"miDebuggerPath": "/path/to/gdb"` : "",
-            this.additionalProperties ? `,${os.EOL}\t${indentJsonString(this.additionalProperties)}` : ""]);
+        this.additionalProperties ? `,${os.EOL}\t${indentJsonString(this.additionalProperties)}` : ""]);
 
         return {
             "label": configPrefix + name,

Extension/src/Debugger/runWithoutDebuggingAdapter.ts

@@ -81,12 +81,10 @@ export class RunWithoutDebuggingAdapter implements vscode.DebugAdapter {
 
         this.sendResponse(request, {});
 
-        if (consoleMode === 'integratedTerminal') {
+        if (consoleMode === 'integratedTerminal' || consoleMode === 'internalConsole') {
             await this.launchIntegratedTerminal(program, args, cwd, env);
         } else if (consoleMode === 'externalTerminal') {
             this.launchExternalTerminal(program, args, cwd, env);
-        } else {
-            this.launchInternalConsole(program, args, cwd, env);
         }
     }
 
@@ -175,29 +173,6 @@ export class RunWithoutDebuggingAdapter implements vscode.DebugAdapter {
         vscode.window.showErrorMessage(message);
     }
 
-    /**
-     * Spawn the process and forward stdout/stderr as DAP output events.
-     */
-    private launchInternalConsole(program: string, args: string[], cwd: string | undefined, env: NodeJS.ProcessEnv) {
-        this.childProcess = cp.spawn(program, args, { cwd, env });
-
-        this.childProcess.stdout?.on('data', (data: Buffer) => {
-            this.sendEvent('output', { category: 'stdout', output: data.toString() });
-        });
-        this.childProcess.stderr?.on('data', (data: Buffer) => {
-            this.sendEvent('output', { category: 'stderr', output: data.toString() });
-        });
-        this.childProcess.on('error', (err: Error) => {
-            this.sendEvent('output', { category: 'stderr', output: `${err.message}\n` });
-            this.sendEvent('exited', { exitCode: 1 });
-            this.sendEvent('terminated');
-        });
-        this.childProcess.on('exit', (code: number | null) => {
-            this.sendEvent('exited', { exitCode: code ?? 0 });
-            this.sendEvent('terminated');
-        });
-    }
-
     private escapeQuotes(arg: string): string {
         return arg.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
     }