From 357d3dd0248ccddafd8fa044b3fd6d82680af1e9 Mon Sep 17 00:00:00 2001 From: Thad House Date: Sat, 18 Dec 2021 23:02:42 -0800 Subject: [PATCH] Switch externalConsole to console (#499) * Switch externalConsole to console * Fix terminal --- vscode-wpilib/src/cpp/debug.ts | 2 +- vscode-wpilib/src/cpp/simulateunix.ts | 2 +- vscode-wpilib/src/cpp/simulatewindows.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vscode-wpilib/src/cpp/debug.ts b/vscode-wpilib/src/cpp/debug.ts index fbd6c8e6..273fb9be 100644 --- a/vscode-wpilib/src/cpp/debug.ts +++ b/vscode-wpilib/src/cpp/debug.ts @@ -17,7 +17,7 @@ export async function startDebugging(commands: IDebugCommands): Promise { MIMode: 'gdb', additionalSOLibSearchPath: commands.soLibPath, cwd: commands.workspace.uri.fsPath, - externalConsole: true, + console: 'integratedTerminal', miDebuggerPath: commands.gdbPath, miDebuggerServerAddress: commands.target, name: 'wpilibCppDebug', diff --git a/vscode-wpilib/src/cpp/simulateunix.ts b/vscode-wpilib/src/cpp/simulateunix.ts index 188e821e..7528af79 100644 --- a/vscode-wpilib/src/cpp/simulateunix.ts +++ b/vscode-wpilib/src/cpp/simulateunix.ts @@ -31,7 +31,7 @@ export async function startUnixSimulation(commands: IUnixSimulateCommands): Prom }, { name: 'DYLD_FALLBACK_LIBRARY_PATH', value: commands.ldPath, }], - externalConsole: false, + console: 'integratedTerminal', name: 'WPILib C++ Simulate', program: commands.executablePath, request: 'launch', diff --git a/vscode-wpilib/src/cpp/simulatewindows.ts b/vscode-wpilib/src/cpp/simulatewindows.ts index 2e85bcfd..8e5dfad6 100644 --- a/vscode-wpilib/src/cpp/simulatewindows.ts +++ b/vscode-wpilib/src/cpp/simulatewindows.ts @@ -37,7 +37,7 @@ export async function startWindowsSimulation(commands: IWindowsSimulateCommands) name: 'HALSIM_EXTENSIONS', value: commands.extensions, }], - externalConsole: true, + console: 'integratedTerminal', name: 'WPILib C++ Simulate', program: commands.launchfile, request: 'launch',