diff --git a/src/vs/workbench/api/electron-browser/mainThreadDialogs.ts b/src/vs/workbench/api/electron-browser/mainThreadDialogs.ts index 6a4e7b7c164baeb94718d0ae8d934a1adaa671f5..dfc8714ca3b707081db87ea39f27cefe12b56c1e 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 { + $showOpenDialog(options: MainThreadDialogOpenOptions): Promise { // 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(resolve => { + return new Promise(resolve => { const filenames = this._windowService.showOpenDialog( MainThreadDialogs._convertOpenOptions(options) ); @@ -39,12 +38,12 @@ export class MainThreadDialogs implements MainThreadDiaglogsShape { }); } - $showSaveDialog(options: MainThreadDialogSaveOptions): TPromise { + $showSaveDialog(options: MainThreadDialogSaveOptions): Promise { // 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(resolve => { + return new Promise(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 9dbf881de705ad5488220fdff9b2ca27d37bca25..111a4643be84edf11d8bdc0e8b830fdb139c9274 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; - $showSaveDialog(options: MainThreadDialogSaveOptions): TPromise; + $showOpenDialog(options: MainThreadDialogOpenOptions): Thenable; + $showSaveDialog(options: MainThreadDialogSaveOptions): Thenable; } export interface MainThreadDecorationsShape extends IDisposable {