diff --git a/src/vs/base/test/node/pfs.test.ts b/src/vs/base/test/node/pfs.test.ts index 75b38405ae1f4cb7f39616d4308f2630efc4ad94..283f03d66f9d83479a80019ff95dd705f9a3001f 100644 --- a/src/vs/base/test/node/pfs.test.ts +++ b/src/vs/base/test/node/pfs.test.ts @@ -2,7 +2,6 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { TPromise } from 'vs/base/common/winjs.base'; import * as assert from 'assert'; import * as os from 'os'; @@ -46,7 +45,7 @@ suite('PFS', () => { return pfs.mkdirp(newDir, 493).then(() => { assert.ok(fs.existsSync(newDir)); - return TPromise.join([ + return Promise.all([ pfs.writeFile(testFile1, 'Hello World 1', null), pfs.writeFile(testFile2, 'Hello World 2', null), pfs.writeFile(testFile3, 'Hello World 3', null), @@ -73,7 +72,7 @@ suite('PFS', () => { return pfs.mkdirp(newDir, 493).then(() => { assert.ok(fs.existsSync(newDir)); - return TPromise.join([ + return Promise.all([ pfs.writeFile(testFile, 'Hello World 1', null), pfs.writeFile(testFile, 'Hello World 2', null), timeout(10).then(() => pfs.writeFile(testFile, 'Hello World 3', null)), @@ -119,4 +118,4 @@ suite('PFS', () => { }); }); }); -}); \ No newline at end of file +}); diff --git a/src/vs/base/test/node/utils.ts b/src/vs/base/test/node/utils.ts index 439ed82eb032baf0f67b7a83e9e51e9d8745f92b..2ee7de39d710de4790303fe9ee3fc115b0362c3b 100644 --- a/src/vs/base/test/node/utils.ts +++ b/src/vs/base/test/node/utils.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { TPromise } from 'vs/base/common/winjs.base'; import { generateUuid } from 'vs/base/common/uuid'; import { join } from 'path'; import { tmpdir } from 'os'; @@ -11,10 +10,10 @@ import { mkdirp, del } from 'vs/base/node/pfs'; export interface ITestFileResult { testFile: string; - cleanUp: () => TPromise; + cleanUp: () => Thenable; } -export function testFile(folder: string, file: string): TPromise { +export function testFile(folder: string, file: string): Thenable { const id = generateUuid(); const parentDir = join(tmpdir(), 'vsctests', id); const newDir = join(parentDir, 'config', id); @@ -26,4 +25,4 @@ export function testFile(folder: string, file: string): TPromise del(parentDir, tmpdir()) } as ITestFileResult; }); -} \ No newline at end of file +} diff --git a/src/vs/editor/standalone/browser/simpleServices.ts b/src/vs/editor/standalone/browser/simpleServices.ts index ed6b9bf5eb9984325833791d5be4ecb51e41876d..d30d386891f71accbe866fc293c674a7126760c2 100644 --- a/src/vs/editor/standalone/browser/simpleServices.ts +++ b/src/vs/editor/standalone/browser/simpleServices.ts @@ -12,7 +12,6 @@ import { IDisposable, IReference, ImmortalReference, combinedDisposable, toDispo import { OS, isLinux, isMacintosh } from 'vs/base/common/platform'; import Severity from 'vs/base/common/severity'; import { URI } from 'vs/base/common/uri'; -import { TPromise } from 'vs/base/common/winjs.base'; import { ICodeEditor, IDiffEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser'; import { IBulkEditOptions, IBulkEditResult, IBulkEditService } from 'vs/editor/browser/services/bulkEditService'; import { isDiffEditorConfigurationKey, isEditorConfigurationKey } from 'vs/editor/common/config/commonEditorConfig'; @@ -58,8 +57,8 @@ export class SimpleModel implements ITextEditorModel { return this._onDispose.event; } - public load(): TPromise { - return TPromise.as(this); + public load(): Promise { + return Promise.resolve(this); } public get textEditorModel(): ITextModel { @@ -98,7 +97,7 @@ export class SimpleEditorModelResolverService implements ITextModelService { this.editor = editor; } - public createModelReference(resource: URI): TPromise> { + public createModelReference(resource: URI): Promise> { let model: ITextModel; model = withTypedEditor(this.editor, @@ -107,10 +106,10 @@ export class SimpleEditorModelResolverService implements ITextModelService { ); if (!model) { - return TPromise.as(new ImmortalReference(null)); + return Promise.resolve(new ImmortalReference(null)); } - return TPromise.as(new ImmortalReference(new SimpleModel(model))); + return Promise.resolve(new ImmortalReference(new SimpleModel(model))); } public registerTextModelContentProvider(scheme: string, provider: ITextModelContentProvider): IDisposable { @@ -482,11 +481,11 @@ export class StandaloneTelemetryService implements ITelemetryService { public isOptedIn = false; - public publicLog(eventName: string, data?: any): TPromise { - return TPromise.wrap(null); + public publicLog(eventName: string, data?: any): Promise { + return Promise.resolve(null); } - public getTelemetryInfo(): TPromise { + public getTelemetryInfo(): Promise { return null; } } diff --git a/src/vs/platform/url/node/urlIpc.ts b/src/vs/platform/url/node/urlIpc.ts index 74943fb400df01b0db1f3b85ef16258e25b072d1..c723fc94adc0a015f0a34076029e675b2ca4f68b 100644 --- a/src/vs/platform/url/node/urlIpc.ts +++ b/src/vs/platform/url/node/urlIpc.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { TPromise } from 'vs/base/common/winjs.base'; import { IChannel } from 'vs/base/parts/ipc/node/ipc'; import { URI } from 'vs/base/common/uri'; import { IDisposable } from 'vs/base/common/lifecycle'; @@ -73,7 +72,7 @@ export class URLHandlerChannelClient implements IURLHandler { constructor(private channel: IChannel) { } - handleURL(uri: URI): TPromise { - return TPromise.wrap(this.channel.call('handleURL', uri.toJSON())); + handleURL(uri: URI): Thenable { + return this.channel.call('handleURL', uri.toJSON()); } } diff --git a/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.ts b/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.ts index 6816a6bc137d7c84c8f0ee5c275ac6ab45019eed..3d1cb79443f2fc12a4461cac6fe9868c4eec0bc5 100644 --- a/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.ts +++ b/src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.ts @@ -11,7 +11,6 @@ import { Color } from 'vs/base/common/color'; import { KeyCode } from 'vs/base/common/keyCodes'; import { Disposable } from 'vs/base/common/lifecycle'; import { escape } from 'vs/base/common/strings'; -import { TPromise } from 'vs/base/common/winjs.base'; import { ContentWidgetPositionPreference, IActiveCodeEditor, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser'; import { EditorAction, ServicesAccessor, registerEditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions'; import { Position } from 'vs/editor/common/core/position'; @@ -180,7 +179,7 @@ class InspectTMScopesWidget extends Disposable implements IContentWidget { private readonly _notificationService: INotificationService; private readonly _model: ITextModel; private readonly _domNode: HTMLElement; - private readonly _grammar: TPromise; + private readonly _grammar: Promise; constructor( editor: IActiveCodeEditor, diff --git a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts index 26825ffc794a739cd6bc725eac04bc078440b258..96e890bad6aff9a8c7a55b1f088038532f133265 100644 --- a/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts +++ b/src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import { localize } from 'vs/nls'; -import { TPromise } from 'vs/base/common/winjs.base'; import { ITextModel } from 'vs/editor/common/model'; import { Disposable, IDisposable, dispose, IReference } from 'vs/base/common/lifecycle'; import { EditorOptions, EditorInput, IEditorMemento } from 'vs/workbench/common/editor'; @@ -179,7 +178,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor { public setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable { if (this.input && this.input.matches(input) && this._hasValidModel() && this.input instanceof HtmlInput && input instanceof HtmlInput && areHtmlInputOptionsEqual(this.input.options, input.options)) { - return TPromise.as(undefined); + return Promise.resolve(undefined); } let oldOptions: HtmlInputOptions | undefined = undefined; @@ -197,7 +196,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor { this._modelChangeSubscription.dispose(); if (!(input instanceof HtmlInput)) { - return TPromise.wrapError(new Error('Invalid input')); + return Promise.reject(new Error('Invalid input')); } return super.setInput(input, options, token).then(() => { @@ -213,7 +212,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor { } if (!this.model) { - return TPromise.wrapError(new Error(localize('html.voidInput', "Invalid editor input."))); + return Promise.reject(new Error(localize('html.voidInput', "Invalid editor input."))); } if (oldOptions && !areHtmlInputOptionsEqual(oldOptions, input.options)) { diff --git a/src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts b/src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts index 1258773ca4297dcfa3f4df5c660e0c69a8258f32..a0e060e0ddec907dae5d148a07eb6070bcc63637 100644 --- a/src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts +++ b/src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts @@ -11,7 +11,6 @@ import { Emitter, Event } from 'vs/base/common/event'; import * as resources from 'vs/base/common/resources'; import * as types from 'vs/base/common/types'; import { URI } from 'vs/base/common/uri'; -import { TPromise } from 'vs/base/common/winjs.base'; import { TokenizationResult, TokenizationResult2 } from 'vs/editor/common/core/token'; import { IState, ITokenizationSupport, LanguageId, TokenMetadata, TokenizationRegistry } from 'vs/editor/common/modes'; import { nullTokenize2 } from 'vs/editor/common/modes/nullMode'; @@ -136,7 +135,7 @@ interface ICreateGrammarResult { export class TextMateService implements ITextMateService { public _serviceBrand: any; - private _grammarRegistry: TPromise<[Registry, StackElement]>; + private _grammarRegistry: Promise<[Registry, StackElement]>; private _modeService: IModeService; private _themeService: IWorkbenchThemeService; private _fileService: IFileService; @@ -213,9 +212,9 @@ export class TextMateService implements ITextMateService { }); } - private _getOrCreateGrammarRegistry(): TPromise<[Registry, StackElement]> { + private _getOrCreateGrammarRegistry(): Promise<[Registry, StackElement]> { if (!this._grammarRegistry) { - this._grammarRegistry = TPromise.wrap(import('vscode-textmate')).then(({ Registry, INITIAL, parseRawGrammar }) => { + this._grammarRegistry = import('vscode-textmate').then(({ Registry, INITIAL, parseRawGrammar }) => { const grammarRegistry = new Registry({ loadGrammar: (scopeName: string) => { const location = this._scopeRegistry.getGrammarLocation(scopeName); @@ -369,16 +368,16 @@ export class TextMateService implements ITextMateService { return result; } - public createGrammar(modeId: string): TPromise { + public createGrammar(modeId: string): Promise { return this._createGrammar(modeId).then(r => r.grammar); } - private _createGrammar(modeId: string): TPromise { + private _createGrammar(modeId: string): Promise { let scopeName = this._languageToScope.get(modeId); let languageRegistration = this._scopeRegistry.getLanguageRegistration(scopeName); if (!languageRegistration) { // No TM grammar defined - return TPromise.wrapError(new Error(nls.localize('no-tm-grammar', "No TM Grammar registered for this language."))); + return Promise.reject(new Error(nls.localize('no-tm-grammar', "No TM Grammar registered for this language."))); } let embeddedLanguages = this._resolveEmbeddedLanguages(languageRegistration.embeddedLanguages); let rawInjectedEmbeddedLanguages = this._injectedEmbeddedLanguages[scopeName]; diff --git a/src/vs/workbench/services/textMate/electron-browser/textMateService.ts b/src/vs/workbench/services/textMate/electron-browser/textMateService.ts index 7efc3029791242d8539bee175d278bdf320e31ee..79c0a7e062308f7be6c5dcec8472b88f430b7a39 100644 --- a/src/vs/workbench/services/textMate/electron-browser/textMateService.ts +++ b/src/vs/workbench/services/textMate/electron-browser/textMateService.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import { Event } from 'vs/base/common/event'; -import { TPromise } from 'vs/base/common/winjs.base'; import { LanguageId } from 'vs/editor/common/modes'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { IGrammar } from 'vscode-textmate'; @@ -16,5 +15,5 @@ export interface ITextMateService { onDidEncounterLanguage: Event; - createGrammar(modeId: string): TPromise; + createGrammar(modeId: string): Promise; }