Skip to content

Commit fdf2dec

Browse files
alexdimaalexdima
committed
Remove usage of TPromise from public editor API (microsoft#53526)
1 parent 6daba77 commit fdf2dec

10 files changed

Lines changed: 19 additions & 27 deletions

File tree

‎build/monaco/api.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ function generateDeclarationFile(out, inputFiles, recipe) {
315315
var resultTxt = result.join(endl);
316316
resultTxt = resultTxt.replace(/\bURI\b/g, 'Uri');
317317
resultTxt = resultTxt.replace(/\bEvent</g, 'IEvent<');
318-
resultTxt = resultTxt.replace(/\bTPromise</g, 'Promise<');
319318
resultTxt = format(resultTxt);
320319
return [
321320
resultTxt,

‎build/monaco/api.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ function generateDeclarationFile(out: string, inputFiles: { [file: string]: stri
366366
let resultTxt = result.join(endl);
367367
resultTxt = resultTxt.replace(/\bURI\b/g, 'Uri');
368368
resultTxt = resultTxt.replace(/\bEvent</g, 'IEvent<');
369-
resultTxt = resultTxt.replace(/\bTPromise</g, 'Promise<');
370369

371370
resultTxt = format(resultTxt);
372371

‎src/vs/editor/browser/widget/codeEditorWidget.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,9 +287,9 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
287287
action.label,
288288
action.alias,
289289
action.precondition,
290-
(): void | TPromise<void> => {
290+
(): Promise<void> => {
291291
return this._instantiationService.invokeFunction((accessor) => {
292-
return action.runEditorCommand(accessor, this, null);
292+
return Promise.resolve(action.runEditorCommand(accessor, this, null));
293293
});
294294
},
295295
this._contextKeyService

‎src/vs/editor/common/editorAction.ts‎

Lines changed: 5 additions & 6 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 { IEditorAction } from 'vs/editor/common/editorCommon';
87
import { IContextKeyService, ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
98

@@ -14,15 +13,15 @@ export class InternalEditorAction implements IEditorAction {
1413
public readonly alias: string;
1514

1615
private readonly _precondition: ContextKeyExpr;
17-
private readonly _run: () => void | TPromise<void>;
16+
private readonly _run: () => Promise<void>;
1817
private readonly _contextKeyService: IContextKeyService;
1918

2019
constructor(
2120
id: string,
2221
label: string,
2322
alias: string,
2423
precondition: ContextKeyExpr,
25-
run: () => void,
24+
run: () => Promise<void>,
2625
contextKeyService: IContextKeyService
2726
) {
2827
this.id = id;
@@ -37,12 +36,12 @@ export class InternalEditorAction implements IEditorAction {
3736
return this._contextKeyService.contextMatchesRules(this._precondition);
3837
}
3938

40-
public run(): TPromise<void> {
39+
public run(): Promise<void> {
4140
if (!this.isSupported()) {
42-
return TPromise.as(void 0);
41+
return Promise.resolve(void 0);
4342
}
4443

4544
const r = this._run();
46-
return r ? r : TPromise.as(void 0);
45+
return r ? r : Promise.resolve(void 0);
4746
}
4847
}

‎src/vs/editor/common/editorCommon.ts‎

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

66
import { IMarkdownString } from 'vs/base/common/htmlContent';
77
import { URI, UriComponents } from 'vs/base/common/uri';
8-
import { TPromise } from 'vs/base/common/winjs.base';
98
import { IDisposable } from 'vs/base/common/lifecycle';
109
import { Position, IPosition } from 'vs/editor/common/core/position';
1110
import { Range, IRange } from 'vs/editor/common/core/range';
@@ -185,7 +184,7 @@ export interface IEditorAction {
185184
readonly label: string;
186185
readonly alias: string;
187186
isSupported(): boolean;
188-
run(): TPromise<void>;
187+
run(): Promise<void>;
189188
}
190189

191190
export type IEditorModel = ITextModel | IDiffEditorModel;

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

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

66
import { IDisposable } from 'vs/base/common/lifecycle';
7-
import { TPromise } from 'vs/base/common/winjs.base';
87
import { ITextModel } from 'vs/editor/common/model';
98
import { ColorId, MetadataConsts, FontStyle, TokenizationRegistry, ITokenizationSupport } from 'vs/editor/common/modes';
109
import { IModeService } from 'vs/editor/common/services/modeService';
@@ -26,7 +25,7 @@ export interface IColorizerElementOptions extends IColorizerOptions {
2625

2726
export class Colorizer {
2827

29-
public static colorizeElement(themeService: IStandaloneThemeService, modeService: IModeService, domNode: HTMLElement, options: IColorizerElementOptions): TPromise<void> {
28+
public static colorizeElement(themeService: IStandaloneThemeService, modeService: IModeService, domNode: HTMLElement, options: IColorizerElementOptions): Promise<void> {
3029
options = options || {};
3130
let theme = options.theme || 'vs';
3231
let mimeType = options.mimeType || domNode.getAttribute('lang') || domNode.getAttribute('data-lang');
@@ -45,7 +44,7 @@ export class Colorizer {
4544
return this.colorize(modeService, text, mimeType, options).then(render, (err) => console.error(err));
4645
}
4746

48-
public static colorize(modeService: IModeService, text: string, mimeType: string, options: IColorizerOptions): TPromise<string> {
47+
public static colorize(modeService: IModeService, text: string, mimeType: string, options: IColorizerOptions): Promise<string> {
4948
if (strings.startsWithUTF8BOM(text)) {
5049
text = text.substr(1);
5150
}
@@ -62,10 +61,10 @@ export class Colorizer {
6261

6362
let tokenizationSupport = TokenizationRegistry.get(language);
6463
if (tokenizationSupport) {
65-
return TPromise.as(_colorize(lines, options.tabSize, tokenizationSupport));
64+
return Promise.resolve(_colorize(lines, options.tabSize, tokenizationSupport));
6665
}
6766

68-
return new TPromise<string>((resolve, reject) => {
67+
return new Promise<string>((resolve, reject) => {
6968
let listener: IDisposable = null;
7069
let timeout: TimeoutTimer = null;
7170

‎src/vs/editor/standalone/browser/quickOpen/quickCommand.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import * as nls from 'vs/nls';
77
import { onUnexpectedError } from 'vs/base/common/errors';
88
import { matchesFuzzy } from 'vs/base/common/filters';
9-
import { TPromise } from 'vs/base/common/winjs.base';
109
import { IContext, IHighlight, QuickOpenEntryGroup, QuickOpenModel } from 'vs/base/parts/quickopen/browser/quickOpenModel';
1110
import { IAutoFocus, Mode } from 'vs/base/parts/quickopen/common/quickOpen';
1211
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@@ -55,7 +54,7 @@ export class EditorActionCommandEntry extends QuickOpenEntryGroup {
5554
this.editor.focus();
5655

5756
try {
58-
let promise = this.action.run() || TPromise.as(null);
57+
let promise = this.action.run() || Promise.resolve();
5958
promise.then(null, onUnexpectedError);
6059
} catch (error) {
6160
onUnexpectedError(error);

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

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

66
import { Disposable, IDisposable, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle';
7-
import { TPromise } from 'vs/base/common/winjs.base';
87
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
98
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
109
import { CommandsRegistry, ICommandService, ICommandHandler } from 'vs/platform/commands/common/commands';
@@ -72,7 +71,7 @@ export interface IActionDescriptor {
7271
* Method that will be executed when the action is triggered.
7372
* @param editor The editor instance is passed in as a convinience
7473
*/
75-
run(editor: ICodeEditor): void | TPromise<void>;
74+
run(editor: ICodeEditor): void | Promise<void>;
7675
}
7776

7877
/**
@@ -221,9 +220,8 @@ export class StandaloneCodeEditor extends CodeEditorWidget implements IStandalon
221220
);
222221
const contextMenuGroupId = _descriptor.contextMenuGroupId || null;
223222
const contextMenuOrder = _descriptor.contextMenuOrder || 0;
224-
const run = (): TPromise<void> => {
225-
const r = _descriptor.run(this);
226-
return r ? r : TPromise.as(void 0);
223+
const run = (): Promise<void> => {
224+
return Promise.resolve(_descriptor.run(this));
227225
};
228226

229227

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,14 @@ export function createWebWorker<T>(opts: IWebWorkerOptions): MonacoWebWorker<T>
240240
/**
241241
* Colorize the contents of `domNode` using attribute `data-lang`.
242242
*/
243-
export function colorizeElement(domNode: HTMLElement, options: IColorizerElementOptions): TPromise<void> {
243+
export function colorizeElement(domNode: HTMLElement, options: IColorizerElementOptions): Promise<void> {
244244
return Colorizer.colorizeElement(StaticServices.standaloneThemeService.get(), StaticServices.modeService.get(), domNode, options);
245245
}
246246

247247
/**
248248
* Colorize `text` using language `languageId`.
249249
*/
250-
export function colorize(text: string, languageId: string, options: IColorizerOptions): TPromise<string> {
250+
export function colorize(text: string, languageId: string, options: IColorizerOptions): Promise<string> {
251251
return Colorizer.colorize(StaticServices.modeService.get(), text, languageId, options);
252252
}
253253

‎src/vs/workbench/parts/quickopen/browser/commandsHandler.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup {
304304
}
305305
*/
306306
this.telemetryService.publicLog('workbenchActionExecuted', { id: action.id, from: 'quick open' });
307-
(action.run() || TPromise.as(null)).then(() => {
307+
(action.run() || Promise.resolve()).then(() => {
308308
if (action instanceof Action) {
309309
action.dispose();
310310
}

0 commit comments

Comments
 (0)