diff --git a/src/vs/workbench/parts/tasks/node/processTaskSystem.ts b/src/vs/workbench/parts/tasks/node/processTaskSystem.ts index 7ef52c614c219b4fc5d074ae3afbcfd8ab3d691d..717f148e5e429eb1e9ad05d4905a3c2969c819c7 100644 --- a/src/vs/workbench/parts/tasks/node/processTaskSystem.ts +++ b/src/vs/workbench/parts/tasks/node/processTaskSystem.ts @@ -7,7 +7,6 @@ import * as nls from 'vs/nls'; import * as Objects from 'vs/base/common/objects'; import * as Types from 'vs/base/common/types'; import * as Platform from 'vs/base/common/platform'; -import { TPromise, Promise } from 'vs/base/common/winjs.base'; import * as Async from 'vs/base/common/async'; import Severity from 'vs/base/common/severity'; import * as Strings from 'vs/base/common/strings'; @@ -51,7 +50,7 @@ export class ProcessTaskSystem implements ITaskSystem { private errorsShown: boolean; private childProcess: LineProcess; private activeTask: CustomTask; - private activeTaskPromise: TPromise; + private activeTaskPromise: Promise; private readonly _onDidStateChange: Emitter; @@ -75,8 +74,8 @@ export class ProcessTaskSystem implements ITaskSystem { return this._onDidStateChange.event; } - public isActive(): TPromise { - return TPromise.as(!!this.childProcess); + public isActive(): Promise { + return Promise.resolve(!!this.childProcess); } public isActiveSync(): boolean { @@ -117,14 +116,14 @@ export class ProcessTaskSystem implements ITaskSystem { return true; } - public terminate(task: Task): TPromise { + public terminate(task: Task): Promise { if (!this.activeTask || Task.getMapKey(this.activeTask) !== Task.getMapKey(task)) { - return TPromise.as({ success: false, task: undefined }); + return Promise.resolve({ success: false, task: undefined }); } return this.terminateAll().then(values => values[0]); } - public terminateAll(): TPromise { + public terminateAll(): Promise { if (this.childProcess) { let task = this.activeTask; return this.childProcess.terminate().then((response) => { @@ -133,7 +132,7 @@ export class ProcessTaskSystem implements ITaskSystem { return [result]; }); } - return TPromise.as([{ success: true, task: undefined }]); + return Promise.resolve([{ success: true, task: undefined }]); } private executeTask(task: Task, trigger: string = Triggers.command): ITaskExecuteResult { @@ -169,7 +168,7 @@ export class ProcessTaskSystem implements ITaskSystem { } */ this.telemetryService.publicLog(ProcessTaskSystem.TelemetryEventName, telemetryEvent); - return TPromise.wrapError(err); + return Promise.reject(err); }); return result; } catch (err) { @@ -356,7 +355,7 @@ export class ProcessTaskSystem implements ITaskSystem { this.activeTaskPromise = null; } - private handleError(task: CustomTask, errorData: ErrorData): Promise { + private handleError(task: CustomTask, errorData: ErrorData): Promise { let makeVisible = false; if (errorData.error && !errorData.terminated) { let args: string = task.command.args ? task.command.args.join(' ') : ''; @@ -382,7 +381,7 @@ export class ProcessTaskSystem implements ITaskSystem { error.stderr = errorData.stderr; error.stdout = errorData.stdout; error.terminated = errorData.terminated; - return TPromise.wrapError(error); + return Promise.reject(error); } private checkTerminated(task: Task, data: SuccessData | ErrorData): boolean {