@codingame/monaco-vscode-host-service-override 5.2.0 → 6.0.0

package/package.json

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

package/vscode/src/vs/workbench/services/host/browser/browserHostService.js

@@ -1,6 +1,7 @@
 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';
@@ -8,6 +9,7 @@ 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';
@@ -15,6 +17,7 @@ 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';
@@ -30,6 +33,7 @@ import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/use
 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';
+import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
 
 const _moduleId = "vs/workbench/services/host/browser/browserHostService";
 var HostShutdownReason;
@@ -39,7 +43,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) {
+    constructor(layoutService, configurationService, fileService, labelService, environmentService, instantiationService, lifecycleService, logService, dialogService, contextService, userDataProfileService, userDataProfilesService) {
         super();
         this.layoutService = layoutService;
         this.configurationService = configurationService;
@@ -52,6 +56,7 @@ let BrowserHostService = class BrowserHostService extends Disposable {
         this.dialogService = dialogService;
         this.contextService = contextService;
         this.userDataProfileService = userDataProfileService;
+        this.userDataProfilesService = userDataProfilesService;
         this.shutdownReason = HostShutdownReason.Unknown;
         if (environmentService.options?.workspaceProvider) {
             this.workspaceProvider = environmentService.options.workspaceProvider;
@@ -277,17 +282,21 @@ let BrowserHostService = class BrowserHostService extends Disposable {
                 newPayload.push(['inspect-brk-extensions', String(this.environmentService.debugExtensionHost.port)]);
             }
         }
-        if (!this.userDataProfileService.currentProfile.isDefault) {
-            newPayload.push(['lastActiveProfile', this.userDataProfileService.currentProfile.id]);
+        const windowConfig = this.configurationService.getValue('window');
+        const newWindowProfile = (windowConfig?.newWindowProfile
+            ? this.userDataProfilesService.profiles.find(profile => profile.name === windowConfig.newWindowProfile)
+            : undefined) ?? this.userDataProfileService.currentProfile;
+        if (!newWindowProfile.isDefault) {
+            newPayload.push(['lastActiveProfile', newWindowProfile.id]);
         }
         return newPayload.length ? newPayload : undefined;
     }
     getRecentLabel(openable) {
         if (isFolderToOpen(openable)) {
-            return this.labelService.getWorkspaceLabel(openable.folderUri, { verbose: 2  });
+            return this.labelService.getWorkspaceLabel(openable.folderUri, { verbose: Verbosity.LONG });
         }
         if (isWorkspaceToOpen(openable)) {
-            return this.labelService.getWorkspaceLabel(getWorkspaceIdentifier(openable.workspaceUri), { verbose: 2  });
+            return this.labelService.getWorkspaceLabel(getWorkspaceIdentifier(openable.workspaceUri), { verbose: Verbosity.LONG });
         }
         return this.labelService.getUriLabel(openable.fileUri);
     }
@@ -318,7 +327,7 @@ let BrowserHostService = class BrowserHostService extends Disposable {
             return;
         }
         if (options?.reuse) {
-            await this.handleExpectedShutdown(4 );
+            await this.handleExpectedShutdown(ShutdownReason.LOAD);
         }
         const opened = await this.workspaceProvider.open(workspace, options);
         if (!opened) {
@@ -379,11 +388,11 @@ let BrowserHostService = class BrowserHostService extends Disposable {
         this.reload();
     }
     async reload() {
-        await this.handleExpectedShutdown(3 );
+        await this.handleExpectedShutdown(ShutdownReason.RELOAD);
         mainWindow.location.reload();
     }
     async close() {
-        await this.handleExpectedShutdown(1 );
+        await this.handleExpectedShutdown(ShutdownReason.CLOSE);
         mainWindow.close();
     }
     async withExpectedShutdown(expectedShutdownTask) {
@@ -421,7 +430,8 @@ BrowserHostService = ( (__decorate([
     ( (__param(7, ILogService))),
     ( (__param(8, IDialogService))),
     ( (__param(9, IWorkspaceContextService))),
-    ( (__param(10, IUserDataProfileService)))
+    ( (__param(10, IUserDataProfileService))),
+    ( (__param(11, IUserDataProfilesService)))
 ], BrowserHostService)));
 
 export { BrowserHostService };

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

@@ -1,5 +1,6 @@
 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';