From 120fe2e1bcb140d056a2342ac29d449c5d84a5ac Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 11 Sep 2018 15:27:38 +0200 Subject: [PATCH] debt - less WinJS.Promise usage --- .../parts/performance/electron-browser/actions.ts | 10 ++++------ .../performance/electron-browser/startupProfiler.ts | 3 +-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/vs/workbench/parts/performance/electron-browser/actions.ts b/src/vs/workbench/parts/performance/electron-browser/actions.ts index 3b83b5a6287..00ca60d5e6d 100644 --- a/src/vs/workbench/parts/performance/electron-browser/actions.ts +++ b/src/vs/workbench/parts/performance/electron-browser/actions.ts @@ -5,7 +5,6 @@ 'use strict'; -import { TPromise } from 'vs/base/common/winjs.base'; import { Action } from 'vs/base/common/actions'; import { IWindowService } from 'vs/platform/windows/common/windows'; import * as nls from 'vs/nls'; @@ -25,7 +24,6 @@ import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; import { forEach } from 'vs/base/common/collections'; import { mergeSort } from 'vs/base/common/arrays'; - class Info { static getTimerInfo(metrics: IStartupMetrics, nodeModuleLoadTime?: number): { [name: string]: Info } { @@ -158,7 +156,7 @@ export class ShowStartupPerformance extends Action { super(id, label); } - run(): TPromise { + run(): Promise { // Show dev tools this.windowService.openDevTools(); @@ -217,7 +215,7 @@ export class ShowStartupPerformance extends Action { console.groupEnd(); }); - return TPromise.as(true); + return Promise.resolve(true); } } @@ -238,7 +236,7 @@ export class ReportPerformanceIssueAction extends Action { super(id, label); } - run(appendix?: string): TPromise { + run(appendix?: string): Promise { Promise.all([ this.timerService.startupMetrics, this.integrityService.isPure() @@ -248,7 +246,7 @@ export class ReportPerformanceIssueAction extends Action { window.open(issueUrl); }); - return TPromise.wrap(true); + return Promise.resolve(true); } private generatePerformanceIssueUrl(metrics: IStartupMetrics, baseUrl: string, name: string, version: string, _commit: string, _date: string, isPure: boolean, appendix?: string): string { diff --git a/src/vs/workbench/parts/performance/electron-browser/startupProfiler.ts b/src/vs/workbench/parts/performance/electron-browser/startupProfiler.ts index 545068b434e..52e522d7cb1 100644 --- a/src/vs/workbench/parts/performance/electron-browser/startupProfiler.ts +++ b/src/vs/workbench/parts/performance/electron-browser/startupProfiler.ts @@ -7,7 +7,6 @@ import { dirname, join } from 'path'; import { basename } from 'vs/base/common/paths'; -import { TPromise } from 'vs/base/common/winjs.base'; import { del, exists, readdir, readFile } from 'vs/base/node/pfs'; import { localize } from 'vs/nls'; import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; @@ -80,7 +79,7 @@ class StartupProfiler implements IWorkbenchContribution { }).then(res => { if (res.confirmed) { const action = this._instantiationService.createInstance(ReportPerformanceIssueAction, ReportPerformanceIssueAction.ID, ReportPerformanceIssueAction.LABEL); - TPromise.join([ + Promise.all([ this._windowsService.showItemInFolder(join(dir, files[0])), action.run(`:warning: Make sure to **attach** these files from your *home*-directory: :warning:\n${files.map(file => `-\`${file}\``).join('\n')}`) ]).then(() => { -- GitLab