Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-23 10:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

use async spawn; fixes #69859

Browse Source
This commit is contained in:
Andre Weinand
2019-10-28 13:10:34 +01:00
parent a97d52c453
commit ec30f64952
2 changed files with 64 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/vs/workbench/api/node/extHostDebugService.ts
View File

@@ -340,46 +340,38 @@ export class ExtHostDebugService implements IExtHostDebugService, ExtHostDebugSe
});
}
return new Promise(resolve => {
if (this._integratedTerminalInstance) {
this._integratedTerminalInstance.processId.then(pid => {
resolve(hasChildProcesses(pid));
}, err => {
resolve(true);
});
} else {
resolve(true);
}
}).then(async needNewTerminal => {
let needNewTerminal = true; // be pessimistic
if (this._integratedTerminalInstance) {
const pid = await this._integratedTerminalInstance.processId;
needNewTerminal = await hasChildProcesses(pid); // if no processes running in terminal reuse terminal
}
const configProvider = await this._configurationService.getConfigProvider();
const shell = this._terminalService.getDefaultShell(true, configProvider);
const configProvider = await this._configurationService.getConfigProvider();
const shell = this._terminalService.getDefaultShell(true, configProvider);
if (needNewTerminal || !this._integratedTerminalInstance) {
const options: vscode.TerminalOptions = {
shellPath: shell,
// shellArgs: this._terminalService._getDefaultShellArgs(configProvider),
cwd: args.cwd,
name: args.title || nls.localize('debug.terminal.title', "debuggee"),
env: args.env
};
delete args.cwd;
delete args.env;
this._integratedTerminalInstance = this._terminalService.createTerminalFromOptions(options);
}
const terminal: vscode.Terminal = this._integratedTerminalInstance;
if (needNewTerminal || !this._integratedTerminalInstance) {
terminal.show();
const options: vscode.TerminalOptions = {
shellPath: shell,
// shellArgs: this._terminalService._getDefaultShellArgs(configProvider),
cwd: args.cwd,
name: args.title || nls.localize('debug.terminal.title', "debuggee"),
env: args.env
};
delete args.cwd;
delete args.env;
this._integratedTerminalInstance = this._terminalService.createTerminalFromOptions(options);
}
return this._integratedTerminalInstance.processId.then(shellProcessId => {
const terminal = this._integratedTerminalInstance;
const command = prepareCommand(args, shell, configProvider);
terminal.show();
terminal.sendText(command, true);
const shellProcessId = await this._integratedTerminalInstance.processId;
const command = prepareCommand(args, shell, configProvider);
terminal.sendText(command, true);
return shellProcessId;
});
});
return shellProcessId;
} else if (args.kind === 'external') {