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

package/package.json

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

@@ -1,7 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
@@ -9,7 +8,6 @@ import { isFolderToOpen, isWorkspaceToOpen, isFileToOpen } from 'vscode/vscode/v
 import { pathsToEditors, isResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor';
 import { whenEditorClosed } from 'vscode/vscode/vs/workbench/browser/editor';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
-import { Verbosity } from 'vscode/vscode/vs/platform/label/common/label';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { ModifierKeyEmitter, onDidRegisterWindow, trackFocus, getActiveDocument, getWindowId, disposableWindowInterval, detectFullscreen, EventType, addDisposableListener, addDisposableThrottledListener } from 'vscode/vscode/vs/base/browser/dom';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -17,7 +15,6 @@ import { IBrowserWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/
 import { memoize } from 'vscode/vscode/vs/base/common/decorators';
 import { parseLineAndColumnAware } from 'vscode/vscode/vs/base/common/extpath';
 import { IWorkspaceEditingService } from 'vscode/vscode/vs/workbench/services/workspaces/common/workspaceEditing.service';
-import { ShutdownReason } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { getWorkspaceIdentifier } from 'vscode/vscode/vs/workbench/services/workspaces/browser/workspaces';
@@ -29,7 +26,6 @@ import { isUndefined } from 'vscode/vscode/vs/base/common/types';
 import { isTemporaryWorkspace } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { coalesce } from 'vscode/vscode/vs/base/common/arrays';
 import { mainWindow, isAuxiliaryWindow } from 'vscode/vscode/vs/base/browser/window';
 import { isIOS, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
@@ -42,7 +38,7 @@ var HostShutdownReason;
     HostShutdownReason[HostShutdownReason["Api"] = 3] = "Api";
 })(HostShutdownReason || (HostShutdownReason = {}))));
 let BrowserHostService = class BrowserHostService extends Disposable {
-    constructor(layoutService, configurationService, fileService, labelService, environmentService, instantiationService, lifecycleService, logService, dialogService, contextService, userDataProfileService, userDataProfilesService) {
+    constructor(layoutService, configurationService, fileService, labelService, environmentService, instantiationService, lifecycleService, logService, dialogService, contextService, userDataProfilesService) {
         super();
         this.layoutService = layoutService;
         this.configurationService = configurationService;
@@ -54,7 +50,6 @@ let BrowserHostService = class BrowserHostService extends Disposable {
         this.logService = logService;
         this.dialogService = dialogService;
         this.contextService = contextService;
-        this.userDataProfileService = userDataProfileService;
         this.userDataProfilesService = userDataProfilesService;
         this.shutdownReason = HostShutdownReason.Unknown;
         if (environmentService.options?.workspaceProvider) {
@@ -281,20 +276,20 @@ let BrowserHostService = class BrowserHostService extends Disposable {
                 newPayload.push(['inspect-brk-extensions', String(this.environmentService.debugExtensionHost.port)]);
             }
         }
-        const newWindowProfile = (options?.forceProfile
+        const newWindowProfile = options?.forceProfile
             ? this.userDataProfilesService.profiles.find(profile => profile.name === options?.forceProfile)
-            : undefined) ?? this.userDataProfileService.currentProfile;
-        if (!newWindowProfile.isDefault) {
+            : undefined;
+        if (newWindowProfile && !newWindowProfile.isDefault) {
             newPayload.push(['profile', newWindowProfile.name]);
         }
         return newPayload.length ? newPayload : undefined;
     }
     getRecentLabel(openable) {
         if (isFolderToOpen(openable)) {
-            return this.labelService.getWorkspaceLabel(openable.folderUri, { verbose: Verbosity.LONG });
+            return this.labelService.getWorkspaceLabel(openable.folderUri, { verbose: 2  });
         }
         if (isWorkspaceToOpen(openable)) {
-            return this.labelService.getWorkspaceLabel(getWorkspaceIdentifier(openable.workspaceUri), { verbose: Verbosity.LONG });
+            return this.labelService.getWorkspaceLabel(getWorkspaceIdentifier(openable.workspaceUri), { verbose: 2  });
         }
         return this.labelService.getUriLabel(openable.fileUri);
     }
@@ -325,17 +320,17 @@ let BrowserHostService = class BrowserHostService extends Disposable {
             return;
         }
         if (options?.reuse) {
-            await this.handleExpectedShutdown(ShutdownReason.LOAD);
+            await this.handleExpectedShutdown(4 );
         }
         const opened = await this.workspaceProvider.open(workspace, options);
         if (!opened) {
             const { confirmed } = await this.dialogService.confirm({
                 type: Severity$1.Warning,
                 message: ( localize(
-                    790,
+                    802,
                     "The browser interrupted the opening of a new tab or window. Press 'Open' to open it anyway."
                 )),
-                primaryButton: ( localize(791, "&&Open"))
+                primaryButton: ( localize(803, "&&Open"))
             });
             if (confirmed) {
                 await this.workspaceProvider.open(workspace, options);
@@ -385,11 +380,11 @@ let BrowserHostService = class BrowserHostService extends Disposable {
         this.reload();
     }
     async reload() {
-        await this.handleExpectedShutdown(ShutdownReason.RELOAD);
+        await this.handleExpectedShutdown(3 );
         mainWindow.location.reload();
     }
     async close() {
-        await this.handleExpectedShutdown(ShutdownReason.CLOSE);
+        await this.handleExpectedShutdown(1 );
         mainWindow.close();
     }
     async withExpectedShutdown(expectedShutdownTask) {
@@ -430,8 +425,7 @@ BrowserHostService = ( (__decorate([
     ( (__param(7, ILogService))),
     ( (__param(8, IDialogService))),
     ( (__param(9, IWorkspaceContextService))),
-    ( (__param(10, IUserDataProfileService))),
-    ( (__param(11, IUserDataProfilesService)))
+    ( (__param(10, IUserDataProfilesService)))
 ], BrowserHostService)));
 
 export { BrowserHostService };

package/vscode/src/vs/workbench/services/themes/browser/browserHostColorSchemeService.js

@@ -1,6 +1,5 @@
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { addMatchMediaChangeListener } from 'vscode/vscode/vs/base/browser/browser';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';