Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-27 20:13:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add more useful error message when terminal launch fails

Browse Source 
Fixes #9087
This commit is contained in:
Daniel Imms
2016-11-01 11:50:07 -07:00
parent 2a95c71350
commit 2eed9dbf60
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
View File

@@ -26,12 +26,15 @@ import { TabFocus } from 'vs/editor/common/config/commonEditorConfig';
import { TerminalConfigHelper, IShell } from 'vs/workbench/parts/terminal/electron-browser/terminalConfigHelper';
export class TerminalInstance implements ITerminalInstance {
/** The amount of time to consider terminal errors to be related to the launch */
private static readonly LAUNCHING_DURATION = 500;
private static EOL_REGEX = /\r?\n/g;
private static _idCounter = 1;
private _id: number;
private _isExiting: boolean;
private _isLaunching: boolean;
private _isVisible: boolean;
private _onDisposed: Emitter<TerminalInstance>;
private _onProcessIdReady: Emitter<TerminalInstance>;
@@ -65,6 +68,7 @@ export class TerminalInstance implements ITerminalInstance {
this._toDispose = [];
this._skipTerminalKeybindings = [];
this._isExiting = false;
this._isLaunching = true;
this._isVisible = false;
this._id = TerminalInstance._idCounter++;
@@ -286,10 +290,18 @@ export class TerminalInstance implements ITerminalInstance {
if (!this._isExiting) {
this.dispose();
if (exitCode) {
this._messageService.show(Severity.Error, nls.localize('terminal.integrated.exitedWithCode', 'The terminal process terminated with exit code: {0}', exitCode));
if (this._isLaunching) {
const args = shell.args && shell.args.length ? ' ' + shell.args.map(a => a.indexOf(' ') !== -1 ? `'${a}'` : a).join(' ') : '';
this._messageService.show(Severity.Error, nls.localize('terminal.integrated.launchFailed', 'The terminal process command `{0}{1}` failed to launch (exit code: {2})', shell.executable, args, exitCode));
} else {
this._messageService.show(Severity.Error, nls.localize('terminal.integrated.exitedWithCode', 'The terminal process terminated with exit code: {0}', exitCode));
}
}
}
});
setTimeout(() => {
this._isLaunching = false;
}, TerminalInstance.LAUNCHING_DURATION);
}
public static createTerminalEnv(parentEnv: IStringDictionary<string>, shell: IShell, workspace: IWorkspace, locale?: string): IStringDictionary<string> {