From 7db472bacf5250f3daff84414d2bfcd2f61aef0c Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Mon, 11 Dec 2017 14:44:00 +0100
Subject: [PATCH] eng - don't use TPromise in dialogs api

---
 .../api/electron-browser/mainThreadDialogs.ts       | 13 ++++++-------
 src/vs/workbench/api/node/extHost.protocol.ts       |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/vs/workbench/api/electron-browser/mainThreadDialogs.ts b/src/vs/workbench/api/electron-browser/mainThreadDialogs.ts
index 6a4e7b7c164..dfc8714ca3b 100644
--- a/src/vs/workbench/api/electron-browser/mainThreadDialogs.ts
+++ b/src/vs/workbench/api/electron-browser/mainThreadDialogs.ts
@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { TPromise } from 'vs/base/common/winjs.base';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
 import { MainThreadDiaglogsShape, MainContext, IExtHostContext, MainThreadDialogOpenOptions, MainThreadDialogSaveOptions } from '../node/extHost.protocol';
 import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
@@ -25,12 +24,12 @@ export class MainThreadDialogs implements MainThreadDiaglogsShape {
 		//
 	}
 
-	$showOpenDialog(options: MainThreadDialogOpenOptions): TPromise<string[]> {
+	$showOpenDialog(options: MainThreadDialogOpenOptions): Promise<string[]> {
 		// TODO@joh what about remote dev setup?
 		if (options.defaultUri && options.defaultUri.scheme !== 'file') {
-			return TPromise.wrapError(new Error('Not supported - Open-dialogs can only be opened on `file`-uris.'));
+			return Promise.reject(new Error('Not supported - Open-dialogs can only be opened on `file`-uris.'));
 		}
-		return new TPromise<string[]>(resolve => {
+		return new Promise<string[]>(resolve => {
 			const filenames = this._windowService.showOpenDialog(
 				MainThreadDialogs._convertOpenOptions(options)
 			);
@@ -39,12 +38,12 @@ export class MainThreadDialogs implements MainThreadDiaglogsShape {
 		});
 	}
 
-	$showSaveDialog(options: MainThreadDialogSaveOptions): TPromise<string> {
+	$showSaveDialog(options: MainThreadDialogSaveOptions): Promise<string> {
 		// TODO@joh what about remote dev setup?
 		if (options.defaultUri && options.defaultUri.scheme !== 'file') {
-			return TPromise.wrapError(new Error('Not supported - Save-dialogs can only be opened on `file`-uris.'));
+			return Promise.reject(new Error('Not supported - Save-dialogs can only be opened on `file`-uris.'));
 		}
-		return new TPromise<string>(resolve => {
+		return new Promise<string>(resolve => {
 			const filename = this._windowService.showSaveDialog(
 				MainThreadDialogs._convertSaveOptions(options)
 			);
diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts
index 9dbf881de70..111a4643be8 100644
--- a/src/vs/workbench/api/node/extHost.protocol.ts
+++ b/src/vs/workbench/api/node/extHost.protocol.ts
@@ -144,8 +144,8 @@ export interface MainThreadDialogSaveOptions {
 }
 
 export interface MainThreadDiaglogsShape extends IDisposable {
-	$showOpenDialog(options: MainThreadDialogOpenOptions): TPromise<string[]>;
-	$showSaveDialog(options: MainThreadDialogSaveOptions): TPromise<string>;
+	$showOpenDialog(options: MainThreadDialogOpenOptions): Thenable<string[]>;
+	$showSaveDialog(options: MainThreadDialogSaveOptions): Thenable<string>;
 }
 
 export interface MainThreadDecorationsShape extends IDisposable {
-- 
GitLab