development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly attach press any key to close terminal listener

Browse source 
Fixes #23692
This commit is contained in:
Daniel Imms 2017-05-22 15:12:02 -07:00
parent 8fcea34676
commit fc4f37fb1f
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
View file

@ -299,6 +299,12 @@ export class TerminalInstance implements ITerminalInstance {
this.layout(new Dimension(width, height));
this.setVisible(this._isVisible);
this.updateConfig();
// If IShellLaunchConfig.waitOnExit was true and the process finished before the terminal
// panel was initialized.
if (this._xterm.getOption('disableStdin')) {
this._attachPressAnyKeyToCloseListener();
}
}
public registerLinkMatcher(regex: RegExp, handler: (url: string) => void, matchIndex?: number, validationCallback?: (uri: string, element: HTMLElement, callback: (isValid: boolean) => void) => void): number {
@ -527,10 +533,7 @@ export class TerminalInstance implements ITerminalInstance {
// Disable all input if the terminal is exiting and listen for next keypress
this._xterm.setOption('disableStdin', true);
if (this._xterm.textarea) {
this._processDisposables.push(DOM.addDisposableListener(this._xterm.textarea, 'keypress', (event: KeyboardEvent) => {
this.dispose();
event.preventDefault();
}));
this._attachPressAnyKeyToCloseListener();
}
} else {
this.dispose();
@ -555,6 +558,13 @@ export class TerminalInstance implements ITerminalInstance {
}
}
private _attachPressAnyKeyToCloseListener() {
this._processDisposables.push(DOM.addDisposableListener(this._xterm.textarea, 'keypress', (event: KeyboardEvent) => {
this.dispose();
event.preventDefault();
}));
}
public reuseTerminal(shell?: IShellLaunchConfig): void {
// Kill and clean up old process
if (this._process) {