microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-11 05:30:03 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

Ensure terminal pty is ready before sendText is called

Browse Source 
Fixes #27939
This commit is contained in:
Daniel Imms
2017-06-02 14:33:24 -07:00
parent 6a01ff4870
commit fcd65cc862
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ import { TerminalLinkHandler } from 'vs/workbench/parts/terminal/electron-browse
import { TerminalWidgetManager } from 'vs/workbench/parts/terminal/browser/terminalWidgetManager';
import { registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
import { scrollbarSliderBackground, scrollbarSliderHoverBackground, scrollbarSliderActiveBackground } from 'vs/platform/theme/common/colorRegistry';
import { TPromise } from "vs/base/common/winjs.base";
/** The amount of time to consider terminal errors to be related to the launch */
const LAUNCHING_DURATION = 500;
@@ -56,6 +57,7 @@ export class TerminalInstance implements ITerminalInstance {
private _hadFocusOnExit: boolean;
private _isLaunching: boolean;
private _isVisible: boolean;
private _processReady: TPromise<void>;
private _isDisposed: boolean;
private _onDisposed: Emitter<ITerminalInstance>;
private _onDataForApi: Emitter<{ instance: ITerminalInstance, data: string }>;
@@ -115,6 +117,11 @@ export class TerminalInstance implements ITerminalInstance {
this._onProcessIdReady = new Emitter<TerminalInstance>();
this._onTitleChanged = new Emitter<string>();
// Create a promise that resolves when the pty is ready
this._processReady = new TPromise<void>(c => {
this.onProcessIdReady(() => c(void 0));
});
this._initDimensions();
this._createProcess(this._contextService.getWorkspace(), this._shellLaunchConfig);
this._createXterm();
@@ -376,13 +383,15 @@ export class TerminalInstance implements ITerminalInstance {
}
public sendText(text: string, addNewLine: boolean): void {
text = this._sanitizeInput(text);
if (addNewLine && text.substr(text.length - 1) !== '\r') {
text += '\r';
}
this._process.send({
event: 'input',
data: text
this._processReady.then(() => {
text = this._sanitizeInput(text);
if (addNewLine && text.substr(text.length - 1) !== '\r') {
text += '\r';
}
this._process.send({
event: 'input',
data: text
});
});
}