@codingame/monaco-vscode-performance-service-override 2.2.2 → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-performance-service-override",
-  "version": "2.2.2",
+  "version": "3.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@3.1.0"
   }
 }

package/vscode/src/vs/workbench/contrib/performance/browser/performance.contribution.js

@@ -3,7 +3,7 @@ import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/comm
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { registerWorkbenchContribution2, Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
 import { PerfviewContrib, PerfviewInput } from './perfviewEditor.js';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
@@ -11,7 +11,7 @@ import { InstantiationService, Trace } from 'vscode/vscode/vs/platform/instantia
 import { EventProfiling } from 'vscode/vscode/vs/base/common/event';
 import { InputLatencyContrib } from './inputLatencyContrib.js';
 
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(PerfviewContrib, 2 );
+registerWorkbenchContribution2(PerfviewContrib.ID, PerfviewContrib, { lazy: true });
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(PerfviewInput.Id, class {
     canSerialize() {
         return true;
@@ -38,8 +38,8 @@ registerAction2(class extends Action2 {
     }
     run(accessor) {
         const editorService = accessor.get(IEditorService);
-        const instaService = accessor.get(IInstantiationService);
-        return editorService.openEditor(instaService.createInstance(PerfviewInput), { pinned: true });
+        const contrib = PerfviewContrib.get();
+        return editorService.openEditor(contrib.getEditorInput(), { pinned: true });
     }
 });
 registerAction2(class PrintServiceCycles extends Action2 {

package/vscode/src/vs/workbench/contrib/performance/browser/perfviewEditor.js

@@ -22,29 +22,43 @@ import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
 import { ITerminalService } from 'vscode/vscode/vs/workbench/contrib/terminal/browser/terminal';
 import { ITextResourceConfigurationService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { getWorkbenchContribution, Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 
-var PerfviewInput_1;
+var PerfviewContrib_1, PerfviewInput_1;
 let PerfviewContrib = class PerfviewContrib {
-    constructor(instaService, textModelResolverService) {
-        this._registration = textModelResolverService.registerTextModelContentProvider('perf', instaService.createInstance(PerfModelContentProvider));
+    static { PerfviewContrib_1 = this; }
+    static get() {
+        return getWorkbenchContribution(PerfviewContrib_1.ID);
+    }
+    static { this.ID = 'workbench.contrib.perfview'; }
+    constructor(_instaService, textModelResolverService) {
+        this._instaService = _instaService;
+        this._inputUri = ( URI.from({ scheme: 'perf', path: 'Startup Performance' }));
+        this._registration = textModelResolverService.registerTextModelContentProvider('perf', _instaService.createInstance(PerfModelContentProvider));
     }
     dispose() {
         this._registration.dispose();
     }
+    getInputUri() {
+        return this._inputUri;
+    }
+    getEditorInput() {
+        return this._instaService.createInstance(PerfviewInput);
+    }
 };
-PerfviewContrib = ( __decorate([
+PerfviewContrib = PerfviewContrib_1 = ( __decorate([
     ( __param(0, IInstantiationService)),
     ( __param(1, ITextModelService))
 ], PerfviewContrib));
 let PerfviewInput = class PerfviewInput extends TextResourceEditorInput {
     static { PerfviewInput_1 = this; }
     static { this.Id = 'PerfviewInput'; }
-    static { this.Uri = ( URI.from({ scheme: 'perf', path: 'Startup Performance' })); }
     get typeId() {
         return PerfviewInput_1.Id;
     }
     constructor(textModelResolverService, textFileService, editorService, fileService, labelService, filesConfigurationService, textResourceConfigurationService) {
-        super(PerfviewInput_1.Uri, ( localizeWithPath(
+        super(PerfviewContrib.get().getInputUri(), ( localizeWithPath(
             'vs/workbench/contrib/performance/browser/perfviewEditor',
             'name',
             "Startup Performance"
@@ -104,6 +118,8 @@ let PerfModelContentProvider = class PerfModelContentProvider {
                 md.blank();
                 this._addPerfMarksTable('Terminal Stats', md, this._timerService.getPerformanceMarks().find(e => e[0] === 'renderer')?.[1].filter(e => e.name.startsWith('code/terminal/')));
                 md.blank();
+                this._addWorkbenchContributionsPerfMarksTable(md);
+                md.blank();
                 this._addRawPerfMarks(md);
                 md.blank();
                 this._addResourceTimingStats(md);
@@ -133,6 +149,7 @@ let PerfModelContentProvider = class PerfModelContentProvider {
     }
     _addSummaryTable(md, stats) {
         const metrics = this._timerService.startupMetrics;
+        const contribTimings = ( Registry.as(Extensions.Workbench)).timings;
         const table = [];
         table.push(['start => app.isReady', metrics.timers.ellapsedAppReady, '[main]', `initial startup: ${metrics.initialStartup}`]);
         table.push(['nls:start => nls:end', metrics.timers.ellapsedNlsGeneration, '[main]', `initial startup: ${metrics.initialStartup}`]);
@@ -154,6 +171,7 @@ let PerfModelContentProvider = class PerfModelContentProvider {
         table.push(['restore viewlet', metrics.timers.ellapsedViewletRestore, '[renderer]', metrics.viewletId]);
         table.push(['restore panel', metrics.timers.ellapsedPanelRestore, '[renderer]', metrics.panelId]);
         table.push(['restore & resolve visible editors', metrics.timers.ellapsedEditorRestore, '[renderer]', `${metrics.editorIds.length}: ${metrics.editorIds.join(', ')}`]);
+        table.push(['create workbench contributions', metrics.timers.ellapsedWorkbenchContributions, '[renderer]', `${(contribTimings.get(1 )?.length ?? 0) + (contribTimings.get(1 )?.length ?? 0)} blocking startup`]);
         table.push(['overall workbench load', metrics.timers.ellapsedWorkbench, '[renderer]', undefined]);
         table.push(['workbench ready', metrics.ellapsed, '[main->renderer]', undefined]);
         table.push(['renderer ready', metrics.timers.ellapsedRenderer, '[renderer]', undefined]);
@@ -197,9 +215,23 @@ let PerfModelContentProvider = class PerfModelContentProvider {
             table.push([name, Math.round(startTime), Math.round(delta), Math.round(total)]);
             lastStartTime = startTime;
         }
-        md.heading(2, name);
+        if (name) {
+            md.heading(2, name);
+        }
         md.table(['Name', 'Timestamp', 'Delta', 'Total'], table);
     }
+    _addWorkbenchContributionsPerfMarksTable(md) {
+        md.heading(2, 'Workbench Contributions Blocking Restore');
+        const timings = ( Registry.as(Extensions.Workbench)).timings;
+        md.li(`Total (LifecyclePhase.Starting): ${timings.get(1 )?.length} (${timings.get(1 )?.reduce((p, c) => p + c[1], 0)}ms)`);
+        md.li(`Total (LifecyclePhase.Ready): ${timings.get(2 )?.length} (${timings.get(2 )?.reduce((p, c) => p + c[1], 0)}ms)`);
+        md.blank();
+        const marks = this._timerService.getPerformanceMarks().find(e => e[0] === 'renderer')?.[1].filter(e => e.name.startsWith('code/willCreateWorkbenchContribution/1') ||
+            e.name.startsWith('code/didCreateWorkbenchContribution/1') ||
+            e.name.startsWith('code/willCreateWorkbenchContribution/2') ||
+            e.name.startsWith('code/didCreateWorkbenchContribution/2'));
+        this._addPerfMarksTable(undefined, md, marks);
+    }
     _addRawPerfMarks(md) {
         for (const [source, marks] of this._timerService.getPerformanceMarks()) {
             md.heading(2, `Raw Perf Marks: ${source}`);