Skip to content

Replace WinJS.Promise.as with Promise.resolve #64597

@jrieken

Description

@jrieken

Time to finish to tackle the last WinJS.Promise usages. Please use resolve instead of as. ❗️ be aware of runtime differences even for promises that created via these factory functions.

@bpasero

src/vs/workbench/test/workbenchTestServices.ts
  1391,19:		return TPromise.as(void 0);
  1387,19:		return TPromise.as(void 0);
  1383,19:		return TPromise.as(void 0);
  1379,19:		return TPromise.as(void 0);
  1375,19:		return TPromise.as(void 0);
  1370,19:		return TPromise.as(true);
  1364,19:		return TPromise.as(undefined);
  1360,19:		return TPromise.as(void 0);
  1356,19:		return TPromise.as(void 0);
  1352,19:		return TPromise.as(void 0);
  1348,19:		return TPromise.as(void 0);
  1344,19:		return TPromise.as(void 0);
  1340,19:		return TPromise.as(void 0);
  1336,19:		return TPromise.as(void 0);
  1332,19:		return TPromise.as(void 0);
  1328,19:		return TPromise.as(void 0);
  1324,19:		return TPromise.as(this.windowCount);
  1320,19:		return TPromise.as(void 0);
  1316,19:		return TPromise.as(void 0);
  1312,19:		return TPromise.as(void 0);
  1308,19:		return TPromise.as(void 0);
  1303,19:		return TPromise.as(void 0);
  1299,19:		return TPromise.as(void 0);
  1295,19:		return TPromise.as(void 0);
  1291,19:		return TPromise.as(void 0);
  1287,19:		return TPromise.as(void 0);
  1283,19:		return TPromise.as(void 0);
  1279,19:		return TPromise.as(void 0);
  1275,19:		return TPromise.as(void 0);
  1271,19:		return TPromise.as(void 0);
  1267,19:		return TPromise.as(void 0);
  1263,19:		return TPromise.as(void 0);
  1259,19:		return TPromise.as(void 0);
  1255,19:		return TPromise.as(void 0);
  1251,19:		return TPromise.as(void 0);
  1247,19:		return TPromise.as(void 0);
  1243,19:		return TPromise.as(void 0);
  1239,19:		return TPromise.as(void 0);
  1235,19:		return TPromise.as(void 0);
  1231,19:		return TPromise.as(void 0);
  1227,19:		return TPromise.as(void 0);
  1223,19:		return TPromise.as(void 0);
  1219,19:		return TPromise.as(void 0);
  1215,19:		return TPromise.as(void 0);
  1211,19:		return TPromise.as(void 0);
  1207,19:		return TPromise.as(void 0);
  1203,19:		return TPromise.as(void 0);
  1199,19:		return TPromise.as(void 0);
  1195,19:		return TPromise.as(void 0);
  1191,19:		return TPromise.as(void 0);
  1187,19:		return TPromise.as(false);
  1146,19:		return TPromise.as(void 0);
  1126,19:		return TPromise.as(void 0);
  1110,19:		return TPromise.as(void 0);
  1106,19:		return TPromise.as(void 0);
  1102,19:		return TPromise.as(void 0);
  1098,19:		return TPromise.as(void 0);
  1094,19:		return TPromise.as(void 0);
  1090,19:		return TPromise.as(void 0);
  1086,19:		return TPromise.as(void 0);
  1082,19:		return TPromise.as(void 0);
  1078,19:		return TPromise.as(void 0);
  1074,19:		return TPromise.as(void 0);
  1070,19:		return TPromise.as(void 0);
  1066,19:		return TPromise.as(void 0);
  1062,19:		return TPromise.as(void 0);
  1058,19:		return TPromise.as(void 0);
  1054,19:		return TPromise.as(void 0);
  1050,19:		return TPromise.as(void 0);
  1046,19:		return TPromise.as(void 0);
  1042,19:		return TPromise.as(void 0);
  1038,19:		return TPromise.as(void 0);
  1034,19:		return TPromise.as(void 0);
  1030,19:		return TPromise.as(void 0);
  1026,19:		return TPromise.as(void 0);
  1022,19:		return TPromise.as(void 0);
  1010,19:		return TPromise.as(false);
  1006,19:		return TPromise.as(false);
  969,19:		return TPromise.as(void 0);
  965,19:		return TPromise.as(void 0);
  961,19:		return TPromise.as(null);
  950,19:		return TPromise.as([]);
  946,19:		return TPromise.as(void 0);
  938,19:		return TPromise.as(void 0);
  934,19:		return TPromise.as(void 0);
  920,19:		return TPromise.as(false);
  916,19:		return TPromise.as(false);
  895,19:		return TPromise.as(null);
  877,19:		return TPromise.as(null);
  873,19:		return TPromise.as([]);
  869,19:		return TPromise.as(null);
  865,19:		return TPromise.as(null);
  861,19:		return TPromise.as(null);
  830,19:		return TPromise.as({
  819,19:		return TPromise.as({
  815,19:		return TPromise.as(null);
  800,19:		return TPromise.as({
  747,19:		return TPromise.as(void 0);
  735,19:		return TPromise.as(null);
  731,19:		return TPromise.as(null);
  689,19:		return TPromise.as(void 0);
  685,19:		return TPromise.as(void 0);
  681,19:		return TPromise.as(void 0);
  677,19:		return TPromise.as(void 0);
  657,19:		return TPromise.as(void 0);
  653,19:		return TPromise.as(void 0);
  516,19:		return TPromise.as(null);
  495,76:void> { return TPromise.as(null); }
  489,78:void> { return TPromise.as(null); }
  427,19:		return TPromise.as(void 0);
  424,19:		return TPromise.as(void 0);
  421,19:		return TPromise.as(0);
  418,19:		return TPromise.as(0);
  415,19:		return TPromise.as(0);
  412,19:		return TPromise.as(0);
  394,19:		return TPromise.as(0);
  390,19:		return TPromise.as({ confirmed: false });
  242,19:		return TPromise.as(void 0);

@roblourens

src/vs/workbench/test/electron-browser/quickopen.perf.integrationTest.ts
  174,19:		return TPromise.as({

@bpasero

src/vs/workbench/services/textfile/test/textFileEditorModel.test.ts
  370,53:setNext(() => TPromise.as(null).then(() => { nextDone = true; return null; }));
  343,41:setPending(1, TPromise.as(null));

@bpasero

src/vs/workbench/services/textfile/common/textFileService.ts
  777,41:handleDirtySourceModels = TPromise.as(void 0);
  742,59:TPromise<any> = TPromise.as(void 0);
  601,35:targetModelResolver = TPromise.as(targetModel);
  570,28:modelPromise = TPromise.as(this._models.get(resource));
  568,85:UntitledEditorModel> = TPromise.as(null);
  552,21:				return TPromise.as(null); // user canceled
  448,24:					return TPromise.as({
  299,20:			return TPromise.as(void 0);
  208,21:				return TPromise.as({ didBackup: false });
  132,31:handleAutoSave = TPromise.as(dirty);

@bpasero

src/vs/workbench/services/textfile/common/textFileEditorModelManager.ts
  152,29:modelPromise = TPromise.as(model);
  143,30:modelPromise = TPromise.as(model);

@bpasero

src/vs/workbench/services/textfile/common/textFileEditorModel.ts
  662,38:saveParticipantPromise = TPromise.as(undefined).then(() => {
  654,41:saveParticipantPromise = TPromise.as(versionId);
  489,20:			return TPromise.as(null);
  436,19:		return TPromise.as<TextFileEditorModel>(this);
  343,22:					return TPromise.as<TextFileEditorModel>(this);
  336,22:					return TPromise.as<TextFileEditorModel>(this);
  265,58:createTextEditorModelPromise || TPromise.as(this);
  248,20:			return TPromise.as(this);
  221,27:loadPromise = TPromise.as(this);

@bpasero

src/vs/workbench/services/editor/browser/editorService.ts
  640,21:				return TPromise.as<IEditor>(control); // the opening was handled, so return early
  636,105: options) : TPromise.as(void 0);

@isidorn

src/vs/workbench/services/configurationResolver/electron-browser/configurationResolverService.ts
  149,20:			return TPromise.as(undefined);

@Tyriar

src/vs/workbench/services/backup/node/backupFileService.ts
  293,19:		return TPromise.as(void 0);
  287,19:		return TPromise.as(void 0);
  281,19:		return TPromise.as(keys(this.backups).map(key => Uri.parse(key)));
  277,19:		return TPromise.as(void 0);
  274,20:			return TPromise.as(createTextBufferFactoryFromSnapshot(snapshot));
  268,19:		return TPromise.as(void 0);
  261,19:		return TPromise.as(void 0);
  258,20:			return TPromise.as(backupResource);
  252,19:		return TPromise.as(this.backups.size > 0);
  163,20:			return TPromise.as(void 0);

@mjbvz

src/vs/workbench/parts/webview/electron-browser/webviewEditorInput.ts
  226,19:		return TPromise.as(new EditorModel());

@alexr00

src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts
  2250,27:taskPromise = TPromise.as(new TaskMap());
  1945,19:		return TPromise.as(undefined);
  1929,20:			return TPromise.as(undefined);
  1902,21:				return TPromise.as(this.createTaskQuickPickEntries(tasks, group, sort, selectedEntry));
  1714,63:runConfigureTasks(); return TPromise.as(undefined); };
  1609,21:				return TPromise.as({ workspaceFolder, config, hasErrors: false });
  1582,20:			return TPromise.as({ workspaceFolder: workspaceFolder, hasErrors: true, config: undefined });
  1576,19:		return TPromise.as<WorkspaceFolderConfigurationResult>({ workspaceFolder, config, hasErrors: hasParseErrors });
  1545,22:					return TPromise.as({ workspaceFolder, set: undefined, configurations: undefined, hasErrors: workspaceFolderConfiguration ? workspaceFolderConfiguration.hasErrors : false });
  1521,20:			return TPromise.as(new Map<string, WorkspaceFolderTaskResult>());
  1293,20:			return TPromise.as<TaskTerminateResponse[]>([]);
  1286,20:			return TPromise.as({ success: true, task: undefined });
  1066,20:			return TPromise.as(undefined);
  1012,20:			return TPromise.as(undefined);
  949,19:		return TPromise.as(task);
  857,24:					return TPromise.as(undefined);
  773,19:		return TPromise.as(this._taskSystem.getActiveTasks());
  771,20:			return TPromise.as([]);
  764,20:			return TPromise.as(false);
  731,20:			return TPromise.as<Task[]>([]);
  710,20:			return TPromise.as(undefined);

@isidorn

src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
  334,50:Thenable<void> = TPromise.as(null);

@roblourens @ramya-rao-a

src/vs/workbench/parts/experiments/test/electron-browser/experimentalPrompts.test.ts
  155,19:		return TPromise.as(null).then(result => {
  131,19:		return TPromise.as(null).then(result => {
  107,19:		return TPromise.as(null).then(result => {

@roblourens @ramya-rao-a

src/vs/workbench/parts/experiments/test/electron-browser/experimentService.test.ts
  795,20:			return TPromise.as(null);

@roblourens @ramya-rao-a

src/vs/workbench/parts/experiments/node/experimentService.ts
  367,41:extensionsCheckPromise = TPromise.as(true);
  270,22:					return TPromise.as(null);
  249,22:					return TPromise.as(null);
  204,21:				return TPromise.as(null);
  183,21:		}, () => TPromise.as(null));
  178,21:				return TPromise.as(null);
  174,20:			return TPromise.as([]);

@RMacfarlane

src/vs/workbench/parts/comments/electron-browser/commentsTreeViewer.ts
  51,19:		return TPromise.as(null);
  45,19:			return Promise.as(element.replies);
  42,19:			return Promise.as(element.commentThreads);
  39,19:			return Promise.as(element.resourceCommentThreads);

@bpasero

src/vs/workbench/common/editor/untitledEditorInput.ts
  181,19:		return TPromise.as(true);

@bpasero

src/vs/workbench/common/editor/textEditorModel.ts
  76,19:		return TPromise.as(this.doCreateTextEditorModel(value, languageSelection, resource));

@bpasero

src/vs/workbench/common/editor.ts
  433,19:		return TPromise.as(true);
  426,19:		return TPromise.as(true);

@bpasero

src/vs/workbench/browser/parts/editor/editorGroupView.ts
  1322,19:		return TPromise.as(void 0);
  1226,20:			return TPromise.as(void 0);
  1145,20:			return TPromise.as(void 0);
  1102,20:			return TPromise.as(false);
  1068,20:			return TPromise.as(false); // no veto
  952,20:			return TPromise.as(void 0);
  849,20:			return TPromise.as(void 0);
  805,33:openEditorPromise = TPromise.as(void 0);
  732,20:			return TPromise.as(void 0);
  280,210:this); return TPromise.as(true); }));

@bpasero

src/vs/workbench/browser/parts/editor/editorControl.ts
  166,20:			return TPromise.as(false);

@bpasero

src/vs/platform/workspaces/electron-main/workspacesMainService.ts
  194,20:			return TPromise.as(workspace);
  55,20:			return TPromise.as(null); // does not look like a valid workspace config file

@bpasero

src/vs/platform/windows/electron-main/windowsService.ts
  554,20:			return TPromise.as(true);
  547,19:		return TPromise.as(null);
  499,19:		return TPromise.as(null);
  488,19:		return TPromise.as(null);
  481,19:		return TPromise.as(null);
  475,19:		return TPromise.as(null);
  469,19:		return TPromise.as(shell.openExternal(url));
  464,19:		return TPromise.as(this._activeWindowId);
  460,19:		return TPromise.as(null);
  454,19:		return TPromise.as(null);
  449,19:		return TPromise.as(this.windowsMainService.getWindows().length);
  444,19:		return TPromise.as(result);
  436,19:		return TPromise.as(null);
  425,19:		return TPromise.as(null);
  417,19:		return TPromise.as(null);
  404,20:			return TPromise.as(null);
  398,19:		return TPromise.as(null);
  387,19:		return TPromise.as(null);
  376,19:		return TPromise.as(null);
  365,19:		return TPromise.as(null);
  354,19:		return TPromise.as(null);
  343,19:		return TPromise.as(null);
  340,20:			return TPromise.as(codeWindow.win.isMaximized());
  332,19:		return TPromise.as(null);
  329,20:			return TPromise.as(codeWindow.win.isFocused());
  321,19:		return TPromise.as(null);
  310,19:		return TPromise.as(null);
  299,19:		return TPromise.as(void 0);
  292,19:		return TPromise.as(void 0);
  285,19:		return TPromise.as(void 0);
  278,19:		return TPromise.as(void 0);
  271,19:		return TPromise.as(void 0);
  264,19:		return TPromise.as(void 0);
  256,19:		return TPromise.as(this.historyService.getRecentlyOpened());
  253,20:			return TPromise.as(this.historyService.getRecentlyOpened(codeWindow.config.workspace || codeWindow.config.folderUri, codeWindow.config.filesToOpen));
  245,19:		return TPromise.as(null);
  238,19:		return TPromise.as(null);
  231,19:		return TPromise.as(null);
  224,19:		return TPromise.as(null);
  213,19:		return TPromise.as(null);
  202,19:		return TPromise.as(null);
  191,19:		return TPromise.as(null);
  180,19:		return TPromise.as(null);
  169,19:		return TPromise.as(null);
  158,19:		return TPromise.as(null);
  147,19:		return TPromise.as(null);
  131,19:		return TPromise.as(null);
  120,19:		return TPromise.as(null);
  88,19:		return TPromise.as(null);
  81,19:		return TPromise.as(null);
  74,19:		return TPromise.as(null);
  67,19:		return TPromise.as(null);

@bpasero

src/vs/platform/windows/common/windows.ts
  438,19:		return TPromise.as(`window:${this._activeWindowId}`);

@sbatten

src/vs/platform/menubar/electron-main/menubarService.ts
  32,19:		return TPromise.as(void 0);

@bpasero

src/vs/code/electron-main/windows.ts
  2050,27:savePromise = TPromise.as(workspace);
  2009,21:				return TPromise.as(null); // return early if the workspace is not valid
  2004,20:			return TPromise.as(null); // return early if the window is not ready or disposed
  1992,21:				return TPromise.as<IEnterWorkspaceResult>(null); // return early if the workspace is not valid
  1987,20:			return TPromise.as(null); // return early if the window is not ready or disposed
  1979,20:			return TPromise.as(null); // return early if the window is not ready or disposed or does not have a workspace

@bpasero

src/vs/code/electron-main/app.ts
  657,22:					return TPromise.as(false);

@jrieken

src/vs/base/test/common/winjs.polyfill.promise.test.ts
  63,32:promise = WinJSPromise.as(123).then(() => actual.push('inThen'));

@bpasero

src/vs/base/parts/quickopen/browser/quickOpenViewer.ts
  46,19:		return TPromise.as(null);
  42,19:		return TPromise.as(model === element ? model.entries : []);

@jrieken

src/vs/base/common/winjs.base.d.ts
  21,16:	public static as<T>(value: T): Promise<T>;
  20,16:	public static as<T, SomePromise extends PromiseLike<T>>(value: SomePromise): SomePromise;
  19,16:	public static as<T>(value: PromiseLike<T>): PromiseLike<T>;
  18,16:	public static as(value: undefined): Promise<undefined>;
  17,16:	public static as(value: null): Promise<null>;

Metadata

Metadata

Assignees

Labels

debtCode quality issuesengineeringVS Code - Build / issue tracking / etc.

Type

No type

Projects

No projects

Relationships

None yet

Development

No branches or pull requests

Issue actions