@codingame/monaco-vscode-performance-service-override 8.0.4 → 9.0.2

package/package.json

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

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

@@ -28,7 +28,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'perfview.show',
-            title: ( localize2(2680, 'Startup Performance')),
+            title: ( localize2(2692, 'Startup Performance')),
             category: Categories.Developer,
             f1: true
         });
@@ -43,7 +43,7 @@ registerAction2(class PrintServiceCycles extends Action2 {
     constructor() {
         super({
             id: 'perf.insta.printAsyncCycles',
-            title: ( localize2(2681, 'Print Service Cycles')),
+            title: ( localize2(2693, 'Print Service Cycles')),
             category: Categories.Developer,
             f1: true
         });
@@ -65,7 +65,7 @@ registerAction2(class PrintServiceTraces extends Action2 {
     constructor() {
         super({
             id: 'perf.insta.printTraces',
-            title: ( localize2(2682, 'Print Service Traces')),
+            title: ( localize2(2694, 'Print Service Traces')),
             category: Categories.Developer,
             f1: true
         });
@@ -84,7 +84,7 @@ registerAction2(class PrintEventProfiling extends Action2 {
     constructor() {
         super({
             id: 'perf.event.profiling',
-            title: ( localize2(2683, 'Print Emitter Profiles')),
+            title: ( localize2(2695, 'Print Emitter Profiles')),
             category: Categories.Developer,
             f1: true
         });

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

@@ -13,7 +13,7 @@ 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, LoaderEventType } from '../../../../base/common/amd.js';
+import { LoaderStats, LoaderEventType } 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';
@@ -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(6146, "Startup Performance")), undefined, undefined, undefined, textModelResolverService, textFileService, editorService, fileService, labelService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService);
+        super(PerfviewContrib.get().getInputUri(), ( localize(6118, "Startup Performance")), undefined, undefined, undefined, textModelResolverService, textFileService, editorService, fileService, labelService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService);
     }
 };
 PerfviewInput = PerfviewInput_1 = ( (__decorate([
@@ -153,13 +153,13 @@ let PerfModelContentProvider = class PerfModelContentProvider {
         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(['require(main.bundle.js)', metrics.timers.ellapsedLoadMainBundle, '[main]', `initial startup: ${metrics.initialStartup}`]);
+        table.push(['import(main.bundle.js)', metrics.timers.ellapsedLoadMainBundle, '[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 require(workbench.desktop.main.js)', metrics.timers.ellapsedWindowLoadToRequire, '[main->renderer]', StartupKindToString(metrics.windowKind)]);
-        table.push(['require(workbench.desktop.main.js)', metrics.timers.ellapsedRequire, '[renderer]', `cached data: ${(metrics.didUseCachedData ? 'YES' : 'NO')}${stats ? `, node_modules took ${stats.nodeRequireTotal}ms` : ''}`]);
+        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(['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]);
@@ -268,13 +268,6 @@ let PerfModelContentProvider = class PerfModelContentProvider {
         map.set(LoaderEventType.CachedDataFound, []);
         map.set(LoaderEventType.CachedDataMissed, []);
         map.set(LoaderEventType.CachedDataRejected, []);
-        if (typeof require.getStats === 'function') {
-            for (const stat of require.getStats()) {
-                if (( (map.has(stat.type)))) {
-                    map.get(stat.type).push(stat.detail);
-                }
-            }
-        }
         const printLists = (arr) => {
             if (arr) {
                 arr.sort();

package/vscode/src/vs/base/common/amd.js

@@ -1,119 +0,0 @@
-var LoaderEventType;
-( (function(LoaderEventType) {
-    LoaderEventType[LoaderEventType["LoaderAvailable"] = 1] = "LoaderAvailable";
-    LoaderEventType[LoaderEventType["BeginLoadingScript"] = 10] = "BeginLoadingScript";
-    LoaderEventType[LoaderEventType["EndLoadingScriptOK"] = 11] = "EndLoadingScriptOK";
-    LoaderEventType[LoaderEventType["EndLoadingScriptError"] = 12] = "EndLoadingScriptError";
-    LoaderEventType[LoaderEventType["BeginInvokeFactory"] = 21] = "BeginInvokeFactory";
-    LoaderEventType[LoaderEventType["EndInvokeFactory"] = 22] = "EndInvokeFactory";
-    LoaderEventType[LoaderEventType["NodeBeginEvaluatingScript"] = 31] = "NodeBeginEvaluatingScript";
-    LoaderEventType[LoaderEventType["NodeEndEvaluatingScript"] = 32] = "NodeEndEvaluatingScript";
-    LoaderEventType[LoaderEventType["NodeBeginNativeRequire"] = 33] = "NodeBeginNativeRequire";
-    LoaderEventType[LoaderEventType["NodeEndNativeRequire"] = 34] = "NodeEndNativeRequire";
-    LoaderEventType[LoaderEventType["CachedDataFound"] = 60] = "CachedDataFound";
-    LoaderEventType[LoaderEventType["CachedDataMissed"] = 61] = "CachedDataMissed";
-    LoaderEventType[LoaderEventType["CachedDataRejected"] = 62] = "CachedDataRejected";
-    LoaderEventType[LoaderEventType["CachedDataCreated"] = 63] = "CachedDataCreated";
-})(LoaderEventType || (LoaderEventType = {})));
-class LoaderStats {
-    static get() {
-        const amdLoadScript = ( new Map());
-        const amdInvokeFactory = ( new Map());
-        const nodeRequire = ( new Map());
-        const nodeEval = ( new Map());
-        function mark(map, stat) {
-            if (( map.has(stat.detail))) {
-                return;
-            }
-            map.set(stat.detail, -stat.timestamp);
-        }
-        function diff(map, stat) {
-            const duration = map.get(stat.detail);
-            if (!duration) {
-                return;
-            }
-            if (duration >= 0) {
-                return;
-            }
-            map.set(stat.detail, duration + stat.timestamp);
-        }
-        let stats = [];
-        if (typeof require === 'function' && typeof require.getStats === 'function') {
-            stats = require.getStats().slice(0).sort((a, b) => a.timestamp - b.timestamp);
-        }
-        for (const stat of stats) {
-            switch (stat.type) {
-                case LoaderEventType.BeginLoadingScript:
-                    mark(amdLoadScript, stat);
-                    break;
-                case LoaderEventType.EndLoadingScriptOK:
-                case LoaderEventType.EndLoadingScriptError:
-                    diff(amdLoadScript, stat);
-                    break;
-                case LoaderEventType.BeginInvokeFactory:
-                    mark(amdInvokeFactory, stat);
-                    break;
-                case LoaderEventType.EndInvokeFactory:
-                    diff(amdInvokeFactory, stat);
-                    break;
-                case LoaderEventType.NodeBeginNativeRequire:
-                    mark(nodeRequire, stat);
-                    break;
-                case LoaderEventType.NodeEndNativeRequire:
-                    diff(nodeRequire, stat);
-                    break;
-                case LoaderEventType.NodeBeginEvaluatingScript:
-                    mark(nodeEval, stat);
-                    break;
-                case LoaderEventType.NodeEndEvaluatingScript:
-                    diff(nodeEval, stat);
-                    break;
-            }
-        }
-        let nodeRequireTotal = 0;
-        nodeRequire.forEach(value => nodeRequireTotal += value);
-        function to2dArray(map) {
-            const res = [];
-            map.forEach((value, index) => res.push([index, value]));
-            return res;
-        }
-        return {
-            amdLoad: to2dArray(amdLoadScript),
-            amdInvoke: to2dArray(amdInvokeFactory),
-            nodeRequire: to2dArray(nodeRequire),
-            nodeEval: to2dArray(nodeEval),
-            nodeRequireTotal
-        };
-    }
-    static 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;
-    }
-}
-
-export { LoaderEventType, LoaderStats };