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

Remove wait loop in extHostTerminalService

Browse Source 
Fixes #12434
This commit is contained in:
Daniel Imms
2016-10-22 04:24:55 -07:00
parent 835893e9d7
commit 611ed75a9b
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vs/workbench/api/node/extHostTerminalService.ts
View File

@@ -5,7 +5,7 @@
'use strict';
import vscode = require('vscode');
import { TPromise } from 'vs/base/common/winjs.base';
import { TPromise, TValueCallback } from 'vs/base/common/winjs.base';
import Event, { Emitter } from 'vs/base/common/event';
import { ExtHostTerminalServiceShape, MainContext, MainThreadTerminalServiceShape } from './extHost.protocol';
import { IThreadService } from 'vs/workbench/services/thread/common/threadService';
@@ -14,15 +14,19 @@ export class ExtHostTerminal implements vscode.Terminal {
private _name: string;
private _id: number;
private _processId: number;
private _proxy: MainThreadTerminalServiceShape;
private _disposed: boolean;
private _queuedRequests: ApiRequest[];
private _pidPromise: TPromise<number>;
private _pidPromiseComplete: TValueCallback<number>;
constructor(proxy: MainThreadTerminalServiceShape, name?: string, shellPath?: string, shellArgs?: string[]) {
this._name = name;
this._queuedRequests = [];
this._proxy = proxy;
this._pidPromise = new TPromise<number>(c => {
this._pidPromiseComplete = c;
});
this._proxy.$createTerminal(name, shellPath, shellArgs).then((id) => {
this._id = id;
this._queuedRequests.forEach((r) => {
@@ -38,14 +42,7 @@ export class ExtHostTerminal implements vscode.Terminal {
public get processId(): Thenable<number> {
this._checkDisposed();
if (this._processId) {
return TPromise.as<number>(this._processId);
}
return new TPromise<number>((resolve) => {
setTimeout(() => {
this.processId.then(resolve);
}, 200);
});
return this._pidPromise;
}
public sendText(text: string, addNewLine: boolean = true): void {
@@ -71,7 +68,8 @@ export class ExtHostTerminal implements vscode.Terminal {
}
public setProcessId(processId: number): void {
this._processId = processId;
this._pidPromiseComplete(processId);
this._pidPromiseComplete = null;
}
private _queueApiRequest(callback: (...args: any[]) => void, args: any[]) {