@codingame/monaco-vscode-performance-service-override 5.3.0 → 6.0.1

package/package.json

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

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

@@ -1,3 +1,20 @@
+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());
@@ -26,29 +43,29 @@ class LoaderStats {
         }
         for (const stat of stats) {
             switch (stat.type) {
-                case 10 :
+                case LoaderEventType.BeginLoadingScript:
                     mark(amdLoadScript, stat);
                     break;
-                case 11 :
-                case 12 :
+                case LoaderEventType.EndLoadingScriptOK:
+                case LoaderEventType.EndLoadingScriptError:
                     diff(amdLoadScript, stat);
                     break;
-                case 21 :
+                case LoaderEventType.BeginInvokeFactory:
                     mark(amdInvokeFactory, stat);
                     break;
-                case 22 :
+                case LoaderEventType.EndInvokeFactory:
                     diff(amdInvokeFactory, stat);
                     break;
-                case 33 :
+                case LoaderEventType.NodeBeginNativeRequire:
                     mark(nodeRequire, stat);
                     break;
-                case 34 :
+                case LoaderEventType.NodeEndNativeRequire:
                     diff(nodeRequire, stat);
                     break;
-                case 31 :
+                case LoaderEventType.NodeBeginEvaluatingScript:
                     mark(nodeEval, stat);
                     break;
-                case 32 :
+                case LoaderEventType.NodeEndEvaluatingScript:
                     diff(nodeEval, stat);
                     break;
             }
@@ -99,4 +116,4 @@ class LoaderStats {
     }
 }
 
-export { LoaderStats };
+export { LoaderEventType, LoaderStats };

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

@@ -1,6 +1,7 @@
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerWorkbenchContribution2, Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
@@ -99,4 +100,4 @@ registerAction2(class PrintEventProfiling extends Action2 {
         }
     }
 });
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(InputLatencyContrib, 4 );
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(InputLatencyContrib, LifecyclePhase.Eventually);

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

@@ -1,6 +1,7 @@
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { BrowserResourcePerformanceMarks, BrowserStartupTimings } from './startupTimings.js';
 
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(BrowserResourcePerformanceMarks, 4 );
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(BrowserStartupTimings, 4 );
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(BrowserResourcePerformanceMarks, LifecyclePhase.Eventually);
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(BrowserStartupTimings, LifecyclePhase.Eventually);

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

@@ -3,7 +3,7 @@ import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { TextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
-import { StartupKindToString } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { LifecyclePhase, StartupKindToString } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -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 } from '../../../../base/common/amd.js';
+import { LoaderStats, LoaderEventType } from '../../../../base/common/amd.js';
 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';
@@ -104,7 +104,7 @@ let PerfModelContentProvider = class PerfModelContentProvider {
     _updateModel() {
         Promise.all([
             this._timerService.whenReady(),
-            this._lifecycleService.when(4 ),
+            this._lifecycleService.when(LifecyclePhase.Eventually),
             this._extensionService.whenInstalledExtensionsRegistered(),
             this._terminalService.whenConnected
         ]).then(() => {
@@ -172,7 +172,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(['create workbench contributions', metrics.timers.ellapsedWorkbenchContributions, '[renderer]', `${(contribTimings.get(LifecyclePhase.Starting)?.length ?? 0) + (contribTimings.get(LifecyclePhase.Starting)?.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]);
@@ -224,8 +224,8 @@ let PerfModelContentProvider = class PerfModelContentProvider {
     _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.li(`Total (LifecyclePhase.Starting): ${timings.get(LifecyclePhase.Starting)?.length} (${timings.get(LifecyclePhase.Starting)?.reduce((p, c) => p + c[1], 0)}ms)`);
+        md.li(`Total (LifecyclePhase.Ready): ${timings.get(LifecyclePhase.Ready)?.length} (${timings.get(LifecyclePhase.Ready)?.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') ||
@@ -265,10 +265,10 @@ let PerfModelContentProvider = class PerfModelContentProvider {
     }
     _addCachedDataStats(md) {
         const map = ( (new Map()));
-        map.set(63 , []);
-        map.set(60 , []);
-        map.set(61 , []);
-        map.set(62 , []);
+        map.set(LoaderEventType.CachedDataCreated, []);
+        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)))) {
@@ -288,13 +288,13 @@ let PerfModelContentProvider = class PerfModelContentProvider {
         md.heading(2, 'Node Cached Data Stats');
         md.blank();
         md.heading(3, 'cached data used');
-        printLists(map.get(60 ));
+        printLists(map.get(LoaderEventType.CachedDataFound));
         md.heading(3, 'cached data missed');
-        printLists(map.get(61 ));
+        printLists(map.get(LoaderEventType.CachedDataMissed));
         md.heading(3, 'cached data rejected');
-        printLists(map.get(62 ));
+        printLists(map.get(LoaderEventType.CachedDataRejected));
         md.heading(3, 'cached data created (lazy, might need refreshes)');
-        printLists(map.get(63 ));
+        printLists(map.get(LoaderEventType.CachedDataCreated));
     }
     _addResourceTimingStats(md) {
         const stats = ( (performance.getEntriesByType('resource').map(entry => {

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

@@ -1,12 +1,13 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { StartupKindToString } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { StartupKind, StartupKindToString } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IUpdateService } from 'vscode/vscode/vs/platform/update/common/update.service';
 import { VIEWLET_ID } from 'vscode/vscode/vs/workbench/contrib/files/common/files';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
+import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
@@ -24,13 +25,13 @@ let StartupTimings = class StartupTimings {
         this._workspaceTrustService = _workspaceTrustService;
     }
     async _isStandardStartup() {
-        if (this._lifecycleService.startupKind !== 1 ) {
+        if (this._lifecycleService.startupKind !== StartupKind.NewWindow) {
             return StartupKindToString(this._lifecycleService.startupKind);
         }
         if (!this._workspaceTrustService.isWorkspaceTrusted()) {
             return 'Workspace not trusted';
         }
-        const activeViewlet = this._paneCompositeService.getActivePaneComposite(0 );
+        const activeViewlet = this._paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar);
         if (!activeViewlet || activeViewlet.getId() !== VIEWLET_ID) {
             return 'Explorer viewlet not visible';
         }
@@ -41,9 +42,9 @@ let StartupTimings = class StartupTimings {
         if (!isCodeEditor(visibleEditorPanes[0].getControl())) {
             return 'Active editor is not a text editor';
         }
-        const activePanel = this._paneCompositeService.getActivePaneComposite(1 );
+        const activePanel = this._paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel);
         if (activePanel) {
-            return `Current active panel : ${this._paneCompositeService.getPaneComposite(activePanel.getId(), 1 )?.name}`;
+            return `Current active panel : ${this._paneCompositeService.getPaneComposite(activePanel.getId(), ViewContainerLocation.Panel)?.name}`;
         }
         const isLatestVersion = await this._updateService.isLatestVersion();
         if (isLatestVersion === false) {