@codingame/monaco-vscode-performance-service-override 9.0.3 → 10.0.1

package/package.json

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

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

@@ -1,7 +1,6 @@
 import { localize2 } 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';
@@ -28,7 +27,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'perfview.show',
-            title: ( localize2(2693, 'Startup Performance')),
+            title: ( localize2(2707, 'Startup Performance')),
             category: Categories.Developer,
             f1: true
         });
@@ -43,7 +42,7 @@ registerAction2(class PrintServiceCycles extends Action2 {
     constructor() {
         super({
             id: 'perf.insta.printAsyncCycles',
-            title: ( localize2(2694, 'Print Service Cycles')),
+            title: ( localize2(2708, 'Print Service Cycles')),
             category: Categories.Developer,
             f1: true
         });
@@ -65,7 +64,7 @@ registerAction2(class PrintServiceTraces extends Action2 {
     constructor() {
         super({
             id: 'perf.insta.printTraces',
-            title: ( localize2(2695, 'Print Service Traces')),
+            title: ( localize2(2709, 'Print Service Traces')),
             category: Categories.Developer,
             f1: true
         });
@@ -84,7 +83,7 @@ registerAction2(class PrintEventProfiling extends Action2 {
     constructor() {
         super({
             id: 'perf.event.profiling',
-            title: ( localize2(2696, 'Print Emitter Profiles')),
+            title: ( localize2(2710, 'Print Emitter Profiles')),
             category: Categories.Developer,
             f1: true
         });
@@ -99,4 +98,4 @@ registerAction2(class PrintEventProfiling extends Action2 {
         }
     }
 });
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(InputLatencyContrib, LifecyclePhase.Eventually);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(InputLatencyContrib, 4 );

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

@@ -1,7 +1,6 @@
-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, LifecyclePhase.Eventually);
-( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(BrowserStartupTimings, LifecyclePhase.Eventually);
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(BrowserResourcePerformanceMarks, 4 );
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(BrowserStartupTimings, 4 );

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

@@ -3,7 +3,7 @@ import { localize } 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 { LifecyclePhase, StartupKindToString } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { 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, LoaderEventType } from 'vscode/vscode/vs/base/common/amd';
+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';
@@ -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(6124, "Startup Performance")), undefined, undefined, undefined, textModelResolverService, textFileService, editorService, fileService, labelService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService);
+        super(PerfviewContrib.get().getInputUri(), ( localize(6177, "Startup Performance")), undefined, undefined, undefined, textModelResolverService, textFileService, editorService, fileService, labelService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService);
     }
 };
 PerfviewInput = PerfviewInput_1 = ( (__decorate([
@@ -103,7 +103,7 @@ let PerfModelContentProvider = class PerfModelContentProvider {
     _updateModel() {
         Promise.all([
             this._timerService.whenReady(),
-            this._lifecycleService.when(LifecyclePhase.Eventually),
+            this._lifecycleService.when(4 ),
             this._extensionService.whenInstalledExtensionsRegistered(),
             this._terminalService.whenConnected
         ]).then(() => {
@@ -171,7 +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(LifecyclePhase.Starting)?.length ?? 0) + (contribTimings.get(LifecyclePhase.Starting)?.length ?? 0)} blocking startup`]);
+        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]);
@@ -223,8 +223,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(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.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') ||
@@ -264,10 +264,10 @@ let PerfModelContentProvider = class PerfModelContentProvider {
     }
     _addCachedDataStats(md) {
         const map = ( (new Map()));
-        map.set(LoaderEventType.CachedDataCreated, []);
-        map.set(LoaderEventType.CachedDataFound, []);
-        map.set(LoaderEventType.CachedDataMissed, []);
-        map.set(LoaderEventType.CachedDataRejected, []);
+        map.set(63 , []);
+        map.set(60 , []);
+        map.set(61 , []);
+        map.set(62 , []);
         const printLists = (arr) => {
             if (arr) {
                 arr.sort();
@@ -280,13 +280,13 @@ let PerfModelContentProvider = class PerfModelContentProvider {
         md.heading(2, 'Node Cached Data Stats');
         md.blank();
         md.heading(3, 'cached data used');
-        printLists(map.get(LoaderEventType.CachedDataFound));
+        printLists(map.get(60 ));
         md.heading(3, 'cached data missed');
-        printLists(map.get(LoaderEventType.CachedDataMissed));
+        printLists(map.get(61 ));
         md.heading(3, 'cached data rejected');
-        printLists(map.get(LoaderEventType.CachedDataRejected));
+        printLists(map.get(62 ));
         md.heading(3, 'cached data created (lazy, might need refreshes)');
-        printLists(map.get(LoaderEventType.CachedDataCreated));
+        printLists(map.get(63 ));
     }
     _addResourceTimingStats(md) {
         const stats = ( (performance.getEntriesByType('resource').map(entry => {

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

@@ -1,13 +1,12 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { isCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { StartupKind, StartupKindToString } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { 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';
@@ -25,13 +24,13 @@ let StartupTimings = class StartupTimings {
         this._workspaceTrustService = _workspaceTrustService;
     }
     async _isStandardStartup() {
-        if (this._lifecycleService.startupKind !== StartupKind.NewWindow) {
+        if (this._lifecycleService.startupKind !== 1 ) {
             return StartupKindToString(this._lifecycleService.startupKind);
         }
         if (!this._workspaceTrustService.isWorkspaceTrusted()) {
             return 'Workspace not trusted';
         }
-        const activeViewlet = this._paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar);
+        const activeViewlet = this._paneCompositeService.getActivePaneComposite(0 );
         if (!activeViewlet || activeViewlet.getId() !== VIEWLET_ID) {
             return 'Explorer viewlet not visible';
         }
@@ -42,9 +41,9 @@ let StartupTimings = class StartupTimings {
         if (!isCodeEditor(visibleEditorPanes[0].getControl())) {
             return 'Active editor is not a text editor';
         }
-        const activePanel = this._paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel);
+        const activePanel = this._paneCompositeService.getActivePaneComposite(1 );
         if (activePanel) {
-            return `Current active panel : ${this._paneCompositeService.getPaneComposite(activePanel.getId(), ViewContainerLocation.Panel)?.name}`;
+            return `Current active panel : ${this._paneCompositeService.getPaneComposite(activePanel.getId(), 1 )?.name}`;
         }
         const isLatestVersion = await this._updateService.isLatestVersion();
         if (isLatestVersion === false) {