eng - less WinJS-promise construction

src/vs/workbench/api/node/extHostTerminalService.ts

@@ -5,7 +5,6 @@
 'use strict';
 
 import vscode = require('vscode');
-import { TPromise, TValueCallback } from 'vs/base/common/winjs.base';
 import Event, { Emitter } from 'vs/base/common/event';
 import { ExtHostTerminalServiceShape, MainContext, MainThreadTerminalServiceShape, IMainContext } from './extHost.protocol';
 
@@ -16,8 +15,8 @@ export class ExtHostTerminal implements vscode.Terminal {
 	private _proxy: MainThreadTerminalServiceShape;
 	private _disposed: boolean;
 	private _queuedRequests: ApiRequest[];
-	private _pidPromise: TPromise<number>;
-	private _pidPromiseComplete: TValueCallback<number>;
+	private _pidPromise: Promise<number>;
+	private _pidPromiseComplete: (value: number) => any;
 
 	constructor(
 		proxy: MainThreadTerminalServiceShape,
@@ -30,7 +29,7 @@ export class ExtHostTerminal implements vscode.Terminal {
 		this._name = name;
 		this._queuedRequests = [];
 		this._proxy = proxy;
-		this._pidPromise = new TPromise<number>(c => {
+		this._pidPromise = new Promise<number>(c => {
 			this._pidPromiseComplete = c;
 		});
 		this._proxy.$createTerminal(name, shellPath, shellArgs, env, waitOnExit).then((id) => {
@@ -172,4 +171,4 @@ class ApiRequest {
 	public run(proxy: MainThreadTerminalServiceShape, id: number) {
 		this._callback.apply(proxy, [id].concat(this._args));
 	}
-}
\ No newline at end of file
+}

src/vs/workbench/parts/html/browser/webview.ts

@@ -6,7 +6,6 @@
 'use strict';
 
 import URI from 'vs/base/common/uri';
-import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import Event, { Emitter } from 'vs/base/common/event';
 import { addDisposableListener, addClass } from 'vs/base/browser/dom';
@@ -43,7 +42,7 @@ export default class Webview {
 	private static index: number = 0;
 
 	private readonly _webview: Electron.WebviewTag;
-	private _ready: TPromise<this>;
+	private _ready: Promise<this>;
 	private _disposables: IDisposable[] = [];
 	private _onDidClickLink = new Emitter<URI>();
 
@@ -78,7 +77,7 @@ export default class Webview {
 		this._webview.preload = require.toUrl('./webview-pre.js');
 		this._webview.src = require.toUrl('./webview.html');
 
-		this._ready = new TPromise<this>(resolve => {
+		this._ready = new Promise<this>(resolve => {
 			const subscription = addDisposableListener(this._webview, 'ipc-message', (event) => {
 				if (event.channel === 'webview-ready') {
 					// console.info('[PID Webview] ' event.args[0]);
@@ -219,7 +218,7 @@ export default class Webview {
 	private _send(channel: string, ...args: any[]): void {
 		this._ready
 			.then(() => this._webview.send(channel, ...args))
-			.done(void 0, console.error);
+			.catch(err => console.error(err));
 	}
 
 	set initialScrollProgress(value: number) {