Skip to content

Commit 1ed6358

Browse files
jriekenjrieken
committed
debt - more TPromise removal microsoft#53526 
1 parent ddd7926 commit 1ed6358

8 files changed

Lines changed: 27 additions & 35 deletions

File tree

‎src/vs/base/test/node/pfs.test.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
* Copyright (c) Microsoft Corporation. All rights reserved.
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
5-
import { TPromise } from 'vs/base/common/winjs.base';
65

76
import * as assert from 'assert';
87
import * as os from 'os';
@@ -46,7 +45,7 @@ suite('PFS', () => {
4645
return pfs.mkdirp(newDir, 493).then(() => {
4746
assert.ok(fs.existsSync(newDir));
4847

49-
return TPromise.join([
48+
return Promise.all([
5049
pfs.writeFile(testFile1, 'Hello World 1', null),
5150
pfs.writeFile(testFile2, 'Hello World 2', null),
5251
pfs.writeFile(testFile3, 'Hello World 3', null),
@@ -73,7 +72,7 @@ suite('PFS', () => {
7372
return pfs.mkdirp(newDir, 493).then(() => {
7473
assert.ok(fs.existsSync(newDir));
7574

76-
return TPromise.join([
75+
return Promise.all([
7776
pfs.writeFile(testFile, 'Hello World 1', null),
7877
pfs.writeFile(testFile, 'Hello World 2', null),
7978
timeout(10).then(() => pfs.writeFile(testFile, 'Hello World 3', null)),
@@ -119,4 +118,4 @@ suite('PFS', () => {
119118
});
120119
});
121120
});
122-
});
121+
});

‎src/vs/base/test/node/utils.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { TPromise } from 'vs/base/common/winjs.base';
76
import { generateUuid } from 'vs/base/common/uuid';
87
import { join } from 'path';
98
import { tmpdir } from 'os';
109
import { mkdirp, del } from 'vs/base/node/pfs';
1110

1211
export interface ITestFileResult {
1312
testFile: string;
14-
cleanUp: () => TPromise<void>;
13+
cleanUp: () => Thenable<void>;
1514
}
1615

17-
export function testFile(folder: string, file: string): TPromise<ITestFileResult> {
16+
export function testFile(folder: string, file: string): Thenable<ITestFileResult> {
1817
const id = generateUuid();
1918
const parentDir = join(tmpdir(), 'vsctests', id);
2019
const newDir = join(parentDir, 'config', id);
@@ -26,4 +25,4 @@ export function testFile(folder: string, file: string): TPromise<ITestFileResult
2625
cleanUp: () => del(parentDir, tmpdir())
2726
} as ITestFileResult;
2827
});
29-
}
28+
}

‎src/vs/editor/standalone/browser/simpleServices.ts‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import { IDisposable, IReference, ImmortalReference, combinedDisposable, toDispo
1212
import { OS, isLinux, isMacintosh } from 'vs/base/common/platform';
1313
import Severity from 'vs/base/common/severity';
1414
import { URI } from 'vs/base/common/uri';
15-
import { TPromise } from 'vs/base/common/winjs.base';
1615
import { ICodeEditor, IDiffEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
1716
import { IBulkEditOptions, IBulkEditResult, IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
1817
import { isDiffEditorConfigurationKey, isEditorConfigurationKey } from 'vs/editor/common/config/commonEditorConfig';
@@ -58,8 +57,8 @@ export class SimpleModel implements ITextEditorModel {
5857
return this._onDispose.event;
5958
}
6059

61-
public load(): TPromise<SimpleModel> {
62-
return TPromise.as(this);
60+
public load(): Promise<SimpleModel> {
61+
return Promise.resolve(this);
6362
}
6463

6564
public get textEditorModel(): ITextModel {
@@ -98,7 +97,7 @@ export class SimpleEditorModelResolverService implements ITextModelService {
9897
this.editor = editor;
9998
}
10099

101-
public createModelReference(resource: URI): TPromise<IReference<ITextEditorModel>> {
100+
public createModelReference(resource: URI): Promise<IReference<ITextEditorModel>> {
102101
let model: ITextModel;
103102

104103
model = withTypedEditor(this.editor,
@@ -107,10 +106,10 @@ export class SimpleEditorModelResolverService implements ITextModelService {
107106
);
108107

109108
if (!model) {
110-
return TPromise.as(new ImmortalReference(null));
109+
return Promise.resolve(new ImmortalReference(null));
111110
}
112111

113-
return TPromise.as(new ImmortalReference(new SimpleModel(model)));
112+
return Promise.resolve(new ImmortalReference(new SimpleModel(model)));
114113
}
115114

116115
public registerTextModelContentProvider(scheme: string, provider: ITextModelContentProvider): IDisposable {
@@ -482,11 +481,11 @@ export class StandaloneTelemetryService implements ITelemetryService {
482481

483482
public isOptedIn = false;
484483

485-
public publicLog(eventName: string, data?: any): TPromise<void> {
486-
return TPromise.wrap<void>(null);
484+
public publicLog(eventName: string, data?: any): Promise<void> {
485+
return Promise.resolve(null);
487486
}
488487

489-
public getTelemetryInfo(): TPromise<ITelemetryInfo> {
488+
public getTelemetryInfo(): Promise<ITelemetryInfo> {
490489
return null;
491490
}
492491
}

‎src/vs/platform/url/node/urlIpc.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { TPromise } from 'vs/base/common/winjs.base';
76
import { IChannel } from 'vs/base/parts/ipc/node/ipc';
87
import { URI } from 'vs/base/common/uri';
98
import { IDisposable } from 'vs/base/common/lifecycle';
@@ -73,7 +72,7 @@ export class URLHandlerChannelClient implements IURLHandler {
7372

7473
constructor(private channel: IChannel) { }
7574

76-
handleURL(uri: URI): TPromise<boolean> {
77-
return TPromise.wrap(this.channel.call('handleURL', uri.toJSON()));
75+
handleURL(uri: URI): Thenable<boolean> {
76+
return this.channel.call('handleURL', uri.toJSON());
7877
}
7978
}

‎src/vs/workbench/parts/codeEditor/electron-browser/textMate/inspectTMScopes.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { Color } from 'vs/base/common/color';
1111
import { KeyCode } from 'vs/base/common/keyCodes';
1212
import { Disposable } from 'vs/base/common/lifecycle';
1313
import { escape } from 'vs/base/common/strings';
14-
import { TPromise } from 'vs/base/common/winjs.base';
1514
import { ContentWidgetPositionPreference, IActiveCodeEditor, ICodeEditor, IContentWidget, IContentWidgetPosition } from 'vs/editor/browser/editorBrowser';
1615
import { EditorAction, ServicesAccessor, registerEditorAction, registerEditorContribution } from 'vs/editor/browser/editorExtensions';
1716
import { Position } from 'vs/editor/common/core/position';
@@ -180,7 +179,7 @@ class InspectTMScopesWidget extends Disposable implements IContentWidget {
180179
private readonly _notificationService: INotificationService;
181180
private readonly _model: ITextModel;
182181
private readonly _domNode: HTMLElement;
183-
private readonly _grammar: TPromise<IGrammar>;
182+
private readonly _grammar: Promise<IGrammar>;
184183

185184
constructor(
186185
editor: IActiveCodeEditor,

‎src/vs/workbench/parts/html/electron-browser/htmlPreviewPart.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { localize } from 'vs/nls';
7-
import { TPromise } from 'vs/base/common/winjs.base';
87
import { ITextModel } from 'vs/editor/common/model';
98
import { Disposable, IDisposable, dispose, IReference } from 'vs/base/common/lifecycle';
109
import { EditorOptions, EditorInput, IEditorMemento } from 'vs/workbench/common/editor';
@@ -179,7 +178,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
179178
public setInput(input: EditorInput, options: EditorOptions, token: CancellationToken): Thenable<void> {
180179

181180
if (this.input && this.input.matches(input) && this._hasValidModel() && this.input instanceof HtmlInput && input instanceof HtmlInput && areHtmlInputOptionsEqual(this.input.options, input.options)) {
182-
return TPromise.as(undefined);
181+
return Promise.resolve(undefined);
183182
}
184183

185184
let oldOptions: HtmlInputOptions | undefined = undefined;
@@ -197,7 +196,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
197196
this._modelChangeSubscription.dispose();
198197

199198
if (!(input instanceof HtmlInput)) {
200-
return TPromise.wrapError<void>(new Error('Invalid input'));
199+
return Promise.reject(new Error('Invalid input'));
201200
}
202201

203202
return super.setInput(input, options, token).then(() => {
@@ -213,7 +212,7 @@ export class HtmlPreviewPart extends BaseWebviewEditor {
213212
}
214213

215214
if (!this.model) {
216-
return TPromise.wrapError<void>(new Error(localize('html.voidInput', "Invalid editor input.")));
215+
return Promise.reject(new Error(localize('html.voidInput', "Invalid editor input.")));
217216
}
218217

219218
if (oldOptions && !areHtmlInputOptionsEqual(oldOptions, input.options)) {

‎src/vs/workbench/services/textMate/electron-browser/TMSyntax.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { Emitter, Event } from 'vs/base/common/event';
1111
import * as resources from 'vs/base/common/resources';
1212
import * as types from 'vs/base/common/types';
1313
import { URI } from 'vs/base/common/uri';
14-
import { TPromise } from 'vs/base/common/winjs.base';
1514
import { TokenizationResult, TokenizationResult2 } from 'vs/editor/common/core/token';
1615
import { IState, ITokenizationSupport, LanguageId, TokenMetadata, TokenizationRegistry } from 'vs/editor/common/modes';
1716
import { nullTokenize2 } from 'vs/editor/common/modes/nullMode';
@@ -136,7 +135,7 @@ interface ICreateGrammarResult {
136135
export class TextMateService implements ITextMateService {
137136
public _serviceBrand: any;
138137

139-
private _grammarRegistry: TPromise<[Registry, StackElement]>;
138+
private _grammarRegistry: Promise<[Registry, StackElement]>;
140139
private _modeService: IModeService;
141140
private _themeService: IWorkbenchThemeService;
142141
private _fileService: IFileService;
@@ -213,9 +212,9 @@ export class TextMateService implements ITextMateService {
213212
});
214213
}
215214

216-
private _getOrCreateGrammarRegistry(): TPromise<[Registry, StackElement]> {
215+
private _getOrCreateGrammarRegistry(): Promise<[Registry, StackElement]> {
217216
if (!this._grammarRegistry) {
218-
this._grammarRegistry = TPromise.wrap(import('vscode-textmate')).then(({ Registry, INITIAL, parseRawGrammar }) => {
217+
this._grammarRegistry = import('vscode-textmate').then(({ Registry, INITIAL, parseRawGrammar }) => {
219218
const grammarRegistry = new Registry({
220219
loadGrammar: (scopeName: string) => {
221220
const location = this._scopeRegistry.getGrammarLocation(scopeName);
@@ -369,16 +368,16 @@ export class TextMateService implements ITextMateService {
369368
return result;
370369
}
371370

372-
public createGrammar(modeId: string): TPromise<IGrammar> {
371+
public createGrammar(modeId: string): Promise<IGrammar> {
373372
return this._createGrammar(modeId).then(r => r.grammar);
374373
}
375374

376-
private _createGrammar(modeId: string): TPromise<ICreateGrammarResult> {
375+
private _createGrammar(modeId: string): Promise<ICreateGrammarResult> {
377376
let scopeName = this._languageToScope.get(modeId);
378377
let languageRegistration = this._scopeRegistry.getLanguageRegistration(scopeName);
379378
if (!languageRegistration) {
380379
// No TM grammar defined
381-
return TPromise.wrapError<ICreateGrammarResult>(new Error(nls.localize('no-tm-grammar', "No TM Grammar registered for this language.")));
380+
return Promise.reject(new Error(nls.localize('no-tm-grammar', "No TM Grammar registered for this language.")));
382381
}
383382
let embeddedLanguages = this._resolveEmbeddedLanguages(languageRegistration.embeddedLanguages);
384383
let rawInjectedEmbeddedLanguages = this._injectedEmbeddedLanguages[scopeName];

‎src/vs/workbench/services/textMate/electron-browser/textMateService.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { Event } from 'vs/base/common/event';
7-
import { TPromise } from 'vs/base/common/winjs.base';
87
import { LanguageId } from 'vs/editor/common/modes';
98
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
109
import { IGrammar } from 'vscode-textmate';
@@ -16,5 +15,5 @@ export interface ITextMateService {
1615

1716
onDidEncounterLanguage: Event<LanguageId>;
1817

19-
createGrammar(modeId: string): TPromise<IGrammar>;
18+
createGrammar(modeId: string): Promise<IGrammar>;
2019
}

0 commit comments

Comments
 (0)