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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-lifecycle-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/workbench/services/lifecycle/browser/lifecycleService.js

@@ -1,8 +1,10 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { ShutdownReason, StartupKind } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { AbstractLifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycleService';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { addDisposableListener, EventType } from 'vscode/vscode/vs/base/browser/dom';
 import { WillSaveStateReason } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
@@ -82,7 +84,7 @@ let BrowserLifecycleService = class BrowserLifecycleService extends AbstractLife
             }
         }
         this._onBeforeShutdown.fire({
-            reason: 2 ,
+            reason: ShutdownReason.QUIT,
             veto(value, id) {
                 handleVeto(value, id);
             },
@@ -103,7 +105,7 @@ let BrowserLifecycleService = class BrowserLifecycleService extends AbstractLife
         this._register(addDisposableListener(mainWindow, EventType.PAGE_SHOW, (e) => this.onLoadAfterUnload(e)));
         const logService = this.logService;
         this._onWillShutdown.fire({
-            reason: 2 ,
+            reason: ShutdownReason.QUIT,
             joiners: () => [],
             token: CancellationToken.None,
             join(promise, joiner) {
@@ -125,7 +127,7 @@ let BrowserLifecycleService = class BrowserLifecycleService extends AbstractLife
         if (typeof startupKind !== 'number') {
             const timing = firstOrDefault(performance.getEntriesByType('navigation'));
             if (timing?.type === 'reload') {
-                startupKind = 3 ;
+                startupKind = StartupKind.ReloadedWindow;
             }
         }
         return startupKind;

package/vscode/src/vs/workbench/services/timer/browser/timerService.js

@@ -1,8 +1,10 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { getMarks } from 'vscode/vscode/vs/base/common/performance';
+import { WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { IUpdateService } from 'vscode/vscode/vs/platform/update/common/update.service';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
@@ -10,6 +12,7 @@ import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/te
 import { Barrier, timeout } from 'vscode/vscode/vs/base/common/async';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
+import { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
 import { TelemetryTrustedValue } from 'vscode/vscode/vs/platform/telemetry/common/telemetryUtils';
 import { isWeb } from 'vscode/vscode/vs/base/common/platform';
 import { createBlobWorker } from 'vscode/vscode/vs/base/browser/defaultWorkerFactory';
@@ -34,6 +37,10 @@ class PerfMarks {
         }
         return toEntry.startTime - fromEntry.startTime;
     }
+    getStartTime(mark) {
+        const entry = this._findEntry(mark);
+        return entry ? entry.startTime : -1;
+    }
     _findEntry(name) {
         for (const [, marks] of this._entries) {
             for (let i = marks.length - 1; i >= 0; i--) {
@@ -62,7 +69,7 @@ let AbstractTimerService = class AbstractTimerService {
         this._rndValueShouldSendTelemetry = Math.random() < .05;
         Promise.all([
             this._extensionService.whenInstalledExtensionsRegistered(),
-            _lifecycleService.when(3 ),
+            _lifecycleService.when(LifecyclePhase.Restored),
             layoutService.whenRestored,
             Promise.all(( Array.from(( ( Registry.as(TerminalExtensions.Backend)).backends.values())).map(e => e.whenReady)))
         ]).then(() => {
@@ -74,7 +81,7 @@ let AbstractTimerService = class AbstractTimerService {
             this._barrier.open();
         });
         this.perfBaseline = this._barrier.wait()
-            .then(() => this._lifecycleService.when(4 ))
+            .then(() => this._lifecycleService.when(LifecyclePhase.Eventually))
             .then(() => timeout(this._startupMetrics.timers.ellapsedRequire))
             .then(() => {
             const jsSrc = ( (function () {
@@ -129,6 +136,9 @@ let AbstractTimerService = class AbstractTimerService {
     getDuration(from, to) {
         return this._marks.getDuration(from, to);
     }
+    getStartTime(mark) {
+        return this._marks.getStartTime(mark);
+    }
     _reportStartupTimes(metrics) {
         this._telemetryService.publicLog('startupTimeVaried', metrics);
     }
@@ -156,8 +166,8 @@ let AbstractTimerService = class AbstractTimerService {
         else {
             startMark = initialStartup ? 'code/didStartMain' : 'code/willOpenNewWindow';
         }
-        const activeViewlet = this._paneCompositeService.getActivePaneComposite(0 );
-        const activePanel = this._paneCompositeService.getActivePaneComposite(1 );
+        const activeViewlet = this._paneCompositeService.getActivePaneComposite(ViewContainerLocation.Sidebar);
+        const activePanel = this._paneCompositeService.getActivePaneComposite(ViewContainerLocation.Panel);
         const info = {
             version: 2,
             ellapsed: this._marks.getDuration(startMark, 'code/didStartWorkbench'),
@@ -207,7 +217,7 @@ let AbstractTimerService = class AbstractTimerService {
             isVMLikelyhood: undefined,
             initialStartup,
             hasAccessibilitySupport: this._accessibilityService.isScreenReaderOptimized(),
-            emptyWorkbench: this._contextService.getWorkbenchState() === 1
+            emptyWorkbench: this._contextService.getWorkbenchState() === WorkbenchState.EMPTY
         };
         await this._extendStartupInfo(info);
         return info;