From 98a67aea25eb39f27f16e37dd6cf39d493024fa7 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Thu, 11 Oct 2018 08:41:54 +0200 Subject: [PATCH] Reduce usage of WinJS.Promise (#53526) --- .../browser/services/abstractCodeEditorService.ts | 3 +-- .../browser/services/codeEditorServiceImpl.ts | 3 +-- src/vs/editor/browser/widget/codeEditorWidget.ts | 5 ++--- src/vs/editor/common/modes/tokenizationRegistry.ts | 3 +-- src/vs/editor/standalone/browser/simpleServices.ts | 14 +++++++------- .../browser/standaloneCodeServiceImpl.ts | 7 +++---- src/vs/platform/actions/common/menu.ts | 3 +-- 7 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/vs/editor/browser/services/abstractCodeEditorService.ts b/src/vs/editor/browser/services/abstractCodeEditorService.ts index 06c2d92afb4..244b2398ac9 100644 --- a/src/vs/editor/browser/services/abstractCodeEditorService.ts +++ b/src/vs/editor/browser/services/abstractCodeEditorService.ts @@ -9,7 +9,6 @@ import { IModelDecorationOptions, ITextModel } from 'vs/editor/common/model'; import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; import { ICodeEditor, IDiffEditor } from 'vs/editor/browser/editorBrowser'; import { IResourceInput } from 'vs/platform/editor/common/editor'; -import { TPromise } from 'vs/base/common/winjs.base'; import { Disposable } from 'vs/base/common/lifecycle'; export abstract class AbstractCodeEditorService extends Disposable implements ICodeEditorService { @@ -127,7 +126,7 @@ export abstract class AbstractCodeEditorService extends Disposable implements IC } abstract getActiveCodeEditor(): ICodeEditor; - abstract openCodeEditor(input: IResourceInput, source: ICodeEditor, sideBySide?: boolean): TPromise; + abstract openCodeEditor(input: IResourceInput, source: ICodeEditor, sideBySide?: boolean): Thenable; } export class ModelTransientSettingWatcher { diff --git a/src/vs/editor/browser/services/codeEditorServiceImpl.ts b/src/vs/editor/browser/services/codeEditorServiceImpl.ts index 69bed90d22f..bed584b18d1 100644 --- a/src/vs/editor/browser/services/codeEditorServiceImpl.ts +++ b/src/vs/editor/browser/services/codeEditorServiceImpl.ts @@ -12,7 +12,6 @@ import { AbstractCodeEditorService } from 'vs/editor/browser/services/abstractCo import { IDisposable, dispose as disposeAll } from 'vs/base/common/lifecycle'; import { IThemeService, ITheme, ThemeColor } from 'vs/platform/theme/common/themeService'; import { IResourceInput } from 'vs/platform/editor/common/editor'; -import { TPromise } from 'vs/base/common/winjs.base'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; export abstract class CodeEditorServiceImpl extends AbstractCodeEditorService { @@ -68,7 +67,7 @@ export abstract class CodeEditorServiceImpl extends AbstractCodeEditorService { } abstract getActiveCodeEditor(): ICodeEditor; - abstract openCodeEditor(input: IResourceInput, source: ICodeEditor, sideBySide?: boolean): TPromise; + abstract openCodeEditor(input: IResourceInput, source: ICodeEditor, sideBySide?: boolean): Thenable; } interface IModelDecorationOptionsProvider extends IDisposable { diff --git a/src/vs/editor/browser/widget/codeEditorWidget.ts b/src/vs/editor/browser/widget/codeEditorWidget.ts index 67bc8a7d23c..4b868e26166 100644 --- a/src/vs/editor/browser/widget/codeEditorWidget.ts +++ b/src/vs/editor/browser/widget/codeEditorWidget.ts @@ -10,7 +10,6 @@ import * as dom from 'vs/base/browser/dom'; import { onUnexpectedError } from 'vs/base/common/errors'; import { Event, Emitter } from 'vs/base/common/event'; import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle'; -import { TPromise } from 'vs/base/common/winjs.base'; import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; @@ -911,7 +910,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE const action = this.getAction(handlerId); if (action) { - TPromise.as(action.run()).then(null, onUnexpectedError); + Promise.resolve(action.run()).then(null, onUnexpectedError); return; } @@ -931,7 +930,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE if (command) { payload = payload || {}; payload.source = source; - TPromise.as(command.runEditorCommand(null, this, payload)).then(null, onUnexpectedError); + Promise.resolve(command.runEditorCommand(null, this, payload)).then(null, onUnexpectedError); return true; } diff --git a/src/vs/editor/common/modes/tokenizationRegistry.ts b/src/vs/editor/common/modes/tokenizationRegistry.ts index 8ff5f366770..a3f815fdd24 100644 --- a/src/vs/editor/common/modes/tokenizationRegistry.ts +++ b/src/vs/editor/common/modes/tokenizationRegistry.ts @@ -7,7 +7,6 @@ import { IDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { Event, Emitter } from 'vs/base/common/event'; import { ColorId, ITokenizationRegistry, ITokenizationSupport, ITokenizationSupportChangedEvent } from 'vs/editor/common/modes'; import { Color } from 'vs/base/common/color'; -import { TPromise } from 'vs/base/common/winjs.base'; export class TokenizationRegistryImpl implements ITokenizationRegistry { @@ -55,7 +54,7 @@ export class TokenizationRegistryImpl implements ITokenizationRegistry { public getPromise(language: string): Thenable { const support = this.get(language); if (support) { - return TPromise.as(support); + return Promise.resolve(support); } const promise = this._promises[language]; if (promise) { diff --git a/src/vs/editor/standalone/browser/simpleServices.ts b/src/vs/editor/standalone/browser/simpleServices.ts index b4ccc3ad5c7..80982017974 100644 --- a/src/vs/editor/standalone/browser/simpleServices.ts +++ b/src/vs/editor/standalone/browser/simpleServices.ts @@ -146,7 +146,7 @@ export class SimpleProgressService implements IProgressService { return SimpleProgressService.NULL_PROGRESS_RUNNER; } - showWhile(promise: TPromise, delay?: number): TPromise { + showWhile(promise: Thenable, delay?: number): Thenable { return null; } } @@ -155,7 +155,7 @@ export class SimpleDialogService implements IDialogService { public _serviceBrand: any; - public confirm(confirmation: IConfirmation): TPromise { + public confirm(confirmation: IConfirmation): Thenable { return this.doConfirm(confirmation).then(confirmed => { return { confirmed, @@ -164,17 +164,17 @@ export class SimpleDialogService implements IDialogService { }); } - private doConfirm(confirmation: IConfirmation): TPromise { + private doConfirm(confirmation: IConfirmation): Thenable { let messageText = confirmation.message; if (confirmation.detail) { messageText = messageText + '\n\n' + confirmation.detail; } - return TPromise.wrap(window.confirm(messageText)); + return Promise.resolve(window.confirm(messageText)); } - public show(severity: Severity, message: string, buttons: string[], options?: IDialogOptions): TPromise { - return TPromise.as(0); + public show(severity: Severity, message: string, buttons: string[], options?: IDialogOptions): Thenable { + return Promise.resolve(0); } } @@ -470,7 +470,7 @@ export class SimpleMenuService implements IMenuService { } public createMenu(id: MenuId, contextKeyService: IContextKeyService): IMenu { - return new Menu(id, TPromise.as(true), this._commandService, contextKeyService); + return new Menu(id, Promise.resolve(true), this._commandService, contextKeyService); } } diff --git a/src/vs/editor/standalone/browser/standaloneCodeServiceImpl.ts b/src/vs/editor/standalone/browser/standaloneCodeServiceImpl.ts index 4e9ddcbc2f9..7d39af3dd1e 100644 --- a/src/vs/editor/standalone/browser/standaloneCodeServiceImpl.ts +++ b/src/vs/editor/standalone/browser/standaloneCodeServiceImpl.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import { IResourceInput } from 'vs/platform/editor/common/editor'; -import { TPromise } from 'vs/base/common/winjs.base'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { CodeEditorServiceImpl } from 'vs/editor/browser/services/codeEditorServiceImpl'; import { ScrollType } from 'vs/editor/common/editorCommon'; @@ -20,12 +19,12 @@ export class StandaloneCodeEditorServiceImpl extends CodeEditorServiceImpl { return null; // not supported in the standalone case } - public openCodeEditor(input: IResourceInput, source: ICodeEditor, sideBySide?: boolean): TPromise { + public openCodeEditor(input: IResourceInput, source: ICodeEditor, sideBySide?: boolean): Thenable { if (!source) { - return TPromise.as(null); + return Promise.resolve(null); } - return TPromise.as(this.doOpenEditor(source, input)); + return Promise.resolve(this.doOpenEditor(source, input)); } private doOpenEditor(editor: ICodeEditor, input: IResourceInput): ICodeEditor { diff --git a/src/vs/platform/actions/common/menu.ts b/src/vs/platform/actions/common/menu.ts index eb36c7f8699..d90656347f8 100644 --- a/src/vs/platform/actions/common/menu.ts +++ b/src/vs/platform/actions/common/menu.ts @@ -5,7 +5,6 @@ import { Event, Emitter } from 'vs/base/common/event'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; -import { TPromise } from 'vs/base/common/winjs.base'; import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { MenuId, MenuRegistry, MenuItemAction, IMenu, IMenuItem, IMenuActionOptions, ISubmenuItem, SubmenuItemAction, isIMenuItem } from 'vs/platform/actions/common/actions'; import { ICommandService } from 'vs/platform/commands/common/commands'; @@ -20,7 +19,7 @@ export class Menu implements IMenu { constructor( id: MenuId, - startupSignal: TPromise, + startupSignal: Thenable, @ICommandService private readonly _commandService: ICommandService, @IContextKeyService private readonly _contextKeyService: IContextKeyService ) { -- GitLab