@codingame/monaco-vscode-performance-service-override 10.1.4 → 11.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-performance-service-override",
-  "version": "10.1.4",
+  "version": "11.0.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@10.1.4"
+    "vscode": "npm:@codingame/monaco-vscode-api@11.0.1"
   }
 }

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

@@ -27,7 +27,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'perfview.show',
-            title: ( localize2(2706, 'Startup Performance')),
+            title: ( localize2(2709, 'Startup Performance')),
             category: Categories.Developer,
             f1: true
         });
@@ -42,7 +42,7 @@ registerAction2(class PrintServiceCycles extends Action2 {
     constructor() {
         super({
             id: 'perf.insta.printAsyncCycles',
-            title: ( localize2(2707, 'Print Service Cycles')),
+            title: ( localize2(2710, 'Print Service Cycles')),
             category: Categories.Developer,
             f1: true
         });
@@ -64,7 +64,7 @@ registerAction2(class PrintServiceTraces extends Action2 {
     constructor() {
         super({
             id: 'perf.insta.printTraces',
-            title: ( localize2(2708, 'Print Service Traces')),
+            title: ( localize2(2711, 'Print Service Traces')),
             category: Categories.Developer,
             f1: true
         });
@@ -83,7 +83,7 @@ registerAction2(class PrintEventProfiling extends Action2 {
     constructor() {
         super({
             id: 'perf.event.profiling',
-            title: ( localize2(2709, 'Print Emitter Profiles')),
+            title: ( localize2(2712, 'Print Emitter Profiles')),
             category: Categories.Developer,
             f1: true
         });

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

@@ -13,7 +13,6 @@ import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extension
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { writeTransientState } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/toggleWordWrap';
-import { LoaderStats } from 'vscode/vscode/vs/base/common/amd';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
@@ -27,6 +26,7 @@ import { ITextResourceConfigurationService } from 'vscode/vscode/vs/editor/commo
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { getWorkbenchContribution, Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { ICustomEditorLabelService } from 'vscode/vscode/vs/workbench/services/editor/common/customEditorLabelService.service';
+import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 
 var PerfviewContrib_1, PerfviewInput_1;
 let PerfviewContrib = class PerfviewContrib {
@@ -61,7 +61,7 @@ let PerfviewInput = class PerfviewInput extends TextResourceEditorInput {
         return PerfviewInput_1.Id;
     }
     constructor(textModelResolverService, textFileService, editorService, fileService, labelService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService) {
-        super(PerfviewContrib.get().getInputUri(), ( localize(6147, "Startup Performance")), undefined, undefined, undefined, textModelResolverService, textFileService, editorService, fileService, labelService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService);
+        super(PerfviewContrib.get().getInputUri(), ( localize(6187, "Startup Performance")), undefined, undefined, undefined, textModelResolverService, textFileService, editorService, fileService, labelService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService);
     }
 };
 PerfviewInput = PerfviewInput_1 = ( (__decorate([
@@ -75,7 +75,7 @@ PerfviewInput = PerfviewInput_1 = ( (__decorate([
     ( (__param(7, ICustomEditorLabelService)))
 ], PerfviewInput)));
 let PerfModelContentProvider = class PerfModelContentProvider {
-    constructor(_modelService, _languageService, _editorService, _lifecycleService, _timerService, _extensionService, _productService, _terminalService) {
+    constructor(_modelService, _languageService, _editorService, _lifecycleService, _timerService, _extensionService, _productService, _remoteAgentService, _terminalService) {
         this._modelService = _modelService;
         this._languageService = _languageService;
         this._editorService = _editorService;
@@ -83,6 +83,7 @@ let PerfModelContentProvider = class PerfModelContentProvider {
         this._timerService = _timerService;
         this._extensionService = _extensionService;
         this._productService = _productService;
+        this._remoteAgentService = _remoteAgentService;
         this._terminalService = _terminalService;
         this._modelDisposables = [];
     }
@@ -105,14 +106,13 @@ let PerfModelContentProvider = class PerfModelContentProvider {
             this._timerService.whenReady(),
             this._lifecycleService.when(4 ),
             this._extensionService.whenInstalledExtensionsRegistered(),
-            this._terminalService.whenConnected
+            isWeb && !this._remoteAgentService.getConnection()?.remoteAuthority ? Promise.resolve() : this._terminalService.whenConnected
         ]).then(() => {
             if (this._model && !this._model.isDisposed()) {
-                const stats = LoaderStats.get();
                 const md = ( (new MarkdownBuilder()));
                 this._addSummary(md);
                 md.blank();
-                this._addSummaryTable(md, stats);
+                this._addSummaryTable(md);
                 md.blank();
                 this._addExtensionsTable(md);
                 md.blank();
@@ -147,19 +147,20 @@ let PerfModelContentProvider = class PerfModelContentProvider {
         md.li(`Screen Reader Active: ${metrics.hasAccessibilitySupport}`);
         md.li(`Empty Workspace: ${metrics.emptyWorkbench}`);
     }
-    _addSummaryTable(md, stats) {
+    _addSummaryTable(md) {
         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}`]);
-        table.push(['import(main.bundle.js)', metrics.timers.ellapsedLoadMainBundle, '[main]', `initial startup: ${metrics.initialStartup}`]);
+        table.push(['import(main.js)', metrics.timers.ellapsedLoadMainBundle, '[main]', `initial startup: ${metrics.initialStartup}`]);
+        table.push(['run main.js', metrics.timers.ellapsedRunMainBundle, '[main]', `initial startup: ${metrics.initialStartup}`]);
         table.push(['start crash reporter', metrics.timers.ellapsedCrashReporter, '[main]', `initial startup: ${metrics.initialStartup}`]);
         table.push(['serve main IPC handle', metrics.timers.ellapsedMainServer, '[main]', `initial startup: ${metrics.initialStartup}`]);
         table.push(['create window', metrics.timers.ellapsedWindowCreate, '[main]', `initial startup: ${metrics.initialStartup}, ${metrics.initialStartup ? `state: ${metrics.timers.ellapsedWindowRestoreState}ms, widget: ${metrics.timers.ellapsedBrowserWindowCreate}ms, show: ${metrics.timers.ellapsedWindowMaximize}ms` : ''}`]);
         table.push(['app.isReady => window.loadUrl()', metrics.timers.ellapsedWindowLoad, '[main]', `initial startup: ${metrics.initialStartup}`]);
         table.push(['window.loadUrl() => begin to import(workbench.desktop.main.js)', metrics.timers.ellapsedWindowLoadToRequire, '[main->renderer]', StartupKindToString(metrics.windowKind)]);
-        table.push(['import(workbench.desktop.main.js)', metrics.timers.ellapsedRequire, '[renderer]', `cached data: ${(metrics.didUseCachedData ? 'YES' : 'NO')}${stats ? `, node_modules took ${stats.nodeRequireTotal}ms` : ''}`]);
+        table.push(['import(workbench.desktop.main.js)', metrics.timers.ellapsedRequire, '[renderer]', `cached data: ${(metrics.didUseCachedData ? 'YES' : 'NO')}`]);
         table.push(['wait for window config', metrics.timers.ellapsedWaitForWindowConfig, '[renderer]', undefined]);
         table.push(['init storage (global & workspace)', metrics.timers.ellapsedStorageInit, '[renderer]', undefined]);
         table.push(['init workspace service', metrics.timers.ellapsedWorkspaceServiceInit, '[renderer]', undefined]);
@@ -248,46 +249,6 @@ let PerfModelContentProvider = class PerfModelContentProvider {
             md.value += '```\n';
         }
     }
-    _addLoaderStats(md, stats) {
-        md.heading(2, 'Loader Stats');
-        md.heading(3, 'Load AMD-module');
-        md.table(['Module', 'Duration'], stats.amdLoad);
-        md.blank();
-        md.heading(3, 'Load commonjs-module');
-        md.table(['Module', 'Duration'], stats.nodeRequire);
-        md.blank();
-        md.heading(3, 'Invoke AMD-module factory');
-        md.table(['Module', 'Duration'], stats.amdInvoke);
-        md.blank();
-        md.heading(3, 'Invoke commonjs-module');
-        md.table(['Module', 'Duration'], stats.nodeEval);
-    }
-    _addCachedDataStats(md) {
-        const map = ( (new Map()));
-        map.set(63 , []);
-        map.set(60 , []);
-        map.set(61 , []);
-        map.set(62 , []);
-        const printLists = (arr) => {
-            if (arr) {
-                arr.sort();
-                for (const e of arr) {
-                    md.li(`${e}`);
-                }
-                md.blank();
-            }
-        };
-        md.heading(2, 'Node Cached Data Stats');
-        md.blank();
-        md.heading(3, 'cached data used');
-        printLists(map.get(60 ));
-        md.heading(3, 'cached data missed');
-        printLists(map.get(61 ));
-        md.heading(3, 'cached data rejected');
-        printLists(map.get(62 ));
-        md.heading(3, 'cached data created (lazy, might need refreshes)');
-        printLists(map.get(63 ));
-    }
     _addResourceTimingStats(md) {
         const stats = ( (performance.getEntriesByType('resource').map(entry => {
             return [entry.name, entry.duration];
@@ -307,7 +268,8 @@ PerfModelContentProvider = ( (__decorate([
     ( (__param(4, ITimerService))),
     ( (__param(5, IExtensionService))),
     ( (__param(6, IProductService))),
-    ( (__param(7, ITerminalService)))
+    ( (__param(7, IRemoteAgentService))),
+    ( (__param(8, ITerminalService)))
 ], PerfModelContentProvider)));
 class MarkdownBuilder {
     constructor() {
@@ -326,7 +288,36 @@ class MarkdownBuilder {
         return this;
     }
     table(header, rows) {
-        this.value += LoaderStats.toMarkdownTable(header, rows);
+        this.value += this.toMarkdownTable(header, rows);
+    }
+    toMarkdownTable(header, rows) {
+        let result = '';
+        const lengths = [];
+        header.forEach((cell, ci) => {
+            lengths[ci] = cell.length;
+        });
+        rows.forEach(row => {
+            row.forEach((cell, ci) => {
+                if (typeof cell === 'undefined') {
+                    cell = row[ci] = '-';
+                }
+                const len = ( (cell.toString())).length;
+                lengths[ci] = Math.max(len, lengths[ci]);
+            });
+        });
+        header.forEach((cell, ci) => { result += `| ${cell + ' '.repeat(lengths[ci] - ( (cell.toString())).length)} `; });
+        result += '|\n';
+        header.forEach((_cell, ci) => { result += `| ${'-'.repeat(lengths[ci])} `; });
+        result += '|\n';
+        rows.forEach(row => {
+            row.forEach((cell, ci) => {
+                if (typeof cell !== 'undefined') {
+                    result += `| ${cell + ' '.repeat(lengths[ci] - ( (cell.toString())).length)} `;
+                }
+            });
+            result += '|\n';
+        });
+        return result;
     }
 }