@codingame/monaco-vscode-view-common-service-override 26.2.2 → 27.0.0

package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js

@@ -23,6 +23,7 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { IRemoteAuthorityResolverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteAuthorityResolver.service';
 import { ITunnelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/tunnel/common/tunnel.service';
+import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { WebviewPortMappingManager } from '../../../../platform/webview/common/webviewPortMapping.js';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { decodeAuthority, webviewRootResourceAuthority, webviewGenericCspSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/common/webview';
@@ -85,7 +86,8 @@ let WebviewElement = class WebviewElement extends Disposable {
         _remoteAuthorityResolverService,
         _tunnelService,
         instantiationService,
-        _accessibilityService
+        _accessibilityService,
+        _uriIdentityService
     ) {
         super();
         this.webviewThemeDataProvider = webviewThemeDataProvider;
@@ -95,6 +97,7 @@ let WebviewElement = class WebviewElement extends Disposable {
         this._remoteAuthorityResolverService = _remoteAuthorityResolverService;
         this._tunnelService = _tunnelService;
         this._accessibilityService = _accessibilityService;
+        this._uriIdentityService = _uriIdentityService;
         this.id = generateUuid();
         this._windowId = undefined;
         this._expectedServiceWorkerVersion = 4;
@@ -202,7 +205,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on("fatal-error", e => {
-            notificationService.error(( localize(13710, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(14607, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({
                 message: e.message
             });
@@ -664,7 +667,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             const result = await loadLocalResource(uri, {
                 ifNoneMatch,
                 roots: this._content.options.localResourceRoots || []
-            }, this._fileService, this._logService, this._resourceLoadingCts.token);
+            }, this._uriIdentityService, this._fileService, this._logService, this._resourceLoadingCts.token);
             switch (result.type) {
             case WebviewResourceResponse.Type.Success:
                 {
@@ -780,6 +783,6 @@ let WebviewElement = class WebviewElement extends Disposable {
         this._webviewFindWidget?.find(previous);
     }
 };
-WebviewElement = ( __decorate([( __param(2, IConfigurationService)), ( __param(3, IContextMenuService)), ( __param(4, INotificationService)), ( __param(5, IWorkbenchEnvironmentService)), ( __param(6, IFileService)), ( __param(7, ILogService)), ( __param(8, IRemoteAuthorityResolverService)), ( __param(9, ITunnelService)), ( __param(10, IInstantiationService)), ( __param(11, IAccessibilityService))], WebviewElement));
+WebviewElement = ( __decorate([( __param(2, IConfigurationService)), ( __param(3, IContextMenuService)), ( __param(4, INotificationService)), ( __param(5, IWorkbenchEnvironmentService)), ( __param(6, IFileService)), ( __param(7, ILogService)), ( __param(8, IRemoteAuthorityResolverService)), ( __param(9, ITunnelService)), ( __param(10, IInstantiationService)), ( __param(11, IAccessibilityService)), ( __param(12, IUriIdentityService))], WebviewElement));
 
 export { WebviewElement };

package/vscode/src/vs/workbench/contrib/webview/browser/webviewFindWidget.d.ts

@@ -4,6 +4,8 @@ import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platf
 import { IContextViewService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
 import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IAccessibilityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service";
 import { SimpleFindWidget } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget";
 export interface WebviewFindDelegate {
     readonly hasFindResult: Event<boolean>;
@@ -21,7 +23,7 @@ export declare class WebviewFindWidget extends SimpleFindWidget {
         resultCount: number;
     } | undefined>;
     protected readonly _findWidgetFocused: IContextKey<boolean>;
-    constructor(_delegate: WebviewFindDelegate, contextViewService: IContextViewService, contextKeyService: IContextKeyService, hoverService: IHoverService, keybindingService: IKeybindingService);
+    constructor(_delegate: WebviewFindDelegate, contextViewService: IContextViewService, contextKeyService: IContextKeyService, hoverService: IHoverService, keybindingService: IKeybindingService, configurationService: IConfigurationService, accessibilityService: IAccessibilityService);
     find(previous: boolean): void;
     hide(animated?: boolean): void;
     protected _onInputChanged(): boolean;

package/vscode/src/vs/workbench/contrib/webview/browser/webviewFindWidget.js

@@ -4,6 +4,8 @@ import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platf
 import { IContextViewService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IAccessibilityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/common/accessibility.service';
 import { SimpleFindWidget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget';
 import { KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview';
 
@@ -16,13 +18,15 @@ let WebviewFindWidget = class WebviewFindWidget extends SimpleFindWidget {
         contextViewService,
         contextKeyService,
         hoverService,
-        keybindingService
+        keybindingService,
+        configurationService,
+        accessibilityService
     ) {
         super({
             showCommonFindToggles: false,
             checkImeCompletionState: _delegate.checkImeCompletionState,
             enableSash: true
-        }, contextViewService, contextKeyService, hoverService, keybindingService);
+        }, contextViewService, contextKeyService, hoverService, keybindingService, configurationService, accessibilityService);
         this._delegate = _delegate;
         this._findWidgetFocused = KEYBINDING_CONTEXT_WEBVIEW_FIND_WIDGET_FOCUSED.bindTo(contextKeyService);
         this._register(_delegate.hasFindResult(hasResult => {
@@ -63,6 +67,6 @@ let WebviewFindWidget = class WebviewFindWidget extends SimpleFindWidget {
     _onFindInputFocusTrackerBlur() {}
     findFirst() {}
 };
-WebviewFindWidget = ( __decorate([( __param(1, IContextViewService)), ( __param(2, IContextKeyService)), ( __param(3, IHoverService)), ( __param(4, IKeybindingService))], WebviewFindWidget));
+WebviewFindWidget = ( __decorate([( __param(1, IContextViewService)), ( __param(2, IContextKeyService)), ( __param(3, IHoverService)), ( __param(4, IKeybindingService)), ( __param(5, IConfigurationService)), ( __param(6, IAccessibilityService))], WebviewFindWidget));
 
 export { WebviewFindWidget };

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js

@@ -18,7 +18,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
         this.ID = "editor.action.webvieweditor.showFind";
     }
     static {
-        this.LABEL = ( localize(13711, "Show find"));
+        this.LABEL = ( localize(14638, "Show find"));
     }
     constructor() {
         super({
@@ -43,7 +43,7 @@ class HideWebViewEditorFindCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.hideFind";
     }
     static {
-        this.LABEL = ( localize(13712, "Stop find"));
+        this.LABEL = ( localize(14639, "Stop find"));
     }
     constructor() {
         super({
@@ -68,7 +68,7 @@ class WebViewEditorFindNextCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.findNext";
     }
     static {
-        this.LABEL = ( localize(13713, "Find next"));
+        this.LABEL = ( localize(14640, "Find next"));
     }
     constructor() {
         super({
@@ -93,7 +93,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.findPrevious";
     }
     static {
-        this.LABEL = ( localize(13714, "Find previous"));
+        this.LABEL = ( localize(14641, "Find previous"));
     }
     constructor() {
         super({
@@ -118,7 +118,7 @@ class ReloadWebviewAction extends Action2 {
         this.ID = "workbench.action.webview.reloadWebviewAction";
     }
     static {
-        this.LABEL = ( localize2(13715, "Reload Webviews"));
+        this.LABEL = ( localize2(14642, "Reload Webviews"));
     }
     constructor() {
         super({

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

@@ -19,7 +19,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ins
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(13717, "webview editor"))),
+    EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(14644, "webview editor"))),
     [( new SyncDescriptor(WebviewInput))]
 );
 let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {

package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js

@@ -560,8 +560,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         if (storedChoices[globForResource]?.find(editorID => editorID === currentEditor.editorId)) {
             return;
         }
-        const handle = this.notificationService.prompt(Severity.Warning, ( localize(14461, "There are multiple default editors available for the resource.")), [{
-            label: ( localize(14462, "Configure Default")),
+        const handle = this.notificationService.prompt(Severity.Warning, ( localize(15389, "There are multiple default editors available for the resource.")), [{
+            label: ( localize(15390, "Configure Default")),
             run: async () => {
                 const picked = await this.doPickEditor(untypedInput, true);
                 if (!picked) {
@@ -579,7 +579,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 }]);
             }
         }, {
-            label: ( localize(14463, "Keep {0}", editorName)),
+            label: ( localize(15391, "Keep {0}", editorName)),
             run: writeCurrentEditorsToStorage
         }]);
         const onCloseListener = handle.onDidClose(() => {
@@ -602,9 +602,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
         });
         const quickPickEntries = [];
-        const currentlyActiveLabel = ( localize(14464, "Active"));
-        const currentDefaultLabel = ( localize(14465, "Default"));
-        const currentDefaultAndActiveLabel = ( localize(14466, "Active and Default"));
+        const currentlyActiveLabel = ( localize(15392, "Active"));
+        const currentDefaultLabel = ( localize(15393, "Default"));
+        const currentDefaultAndActiveLabel = ( localize(15394, "Active and Default"));
         let defaultViewType = defaultSetting;
         if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
             defaultViewType = registeredEditors[1]?.editorInfo.id;
@@ -631,7 +631,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             quickPickEntries.push(separator);
             const configureDefaultEntry = {
                 id: EditorResolverService_1.configureDefaultID,
-                label: ( localize(14467, "Configure default editor for '{0}'...", `*${extname(resource)}`))
+                label: ( localize(15395, "Configure default editor for '{0}'...", `*${extname(resource)}`))
             };
             quickPickEntries.push(configureDefaultEntry);
         }
@@ -651,7 +651,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         const editorPicker = disposables.add(this.quickInputService.createQuickPick({
             useSeparators: true
         }));
-        const placeHolderMessage = showDefaultPicker ? ( localize(14468, "Select new default editor for '{0}'", `*${extname(resource)}`)) : ( localize(14469, "Select editor for '{0}'", basename(resource)));
+        const placeHolderMessage = showDefaultPicker ? ( localize(15396, "Select new default editor for '{0}'", `*${extname(resource)}`)) : ( localize(15397, "Select editor for '{0}'", basename(resource)));
         editorPicker.placeholder = placeHolderMessage;
         editorPicker.canAcceptInBackground = true;
         editorPicker.items = editorPicks;

package/vscode/src/vs/workbench/services/history/browser/historyService.js

@@ -101,33 +101,33 @@ let HistoryService = class HistoryService extends Disposable {
             return matcher;
         })));
         this.editorHelper = this.instantiationService.createInstance(EditorHelper);
-        this.canNavigateBackContextKey = ( new RawContextKey("canNavigateBack", false, ( localize(14683, "Whether it is possible to navigate back in editor history")))).bindTo(this.contextKeyService);
-        this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(14684, "Whether it is possible to navigate forward in editor history")))).bindTo(this.contextKeyService);
+        this.canNavigateBackContextKey = ( new RawContextKey("canNavigateBack", false, ( localize(15611, "Whether it is possible to navigate back in editor history")))).bindTo(this.contextKeyService);
+        this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(15612, "Whether it is possible to navigate forward in editor history")))).bindTo(this.contextKeyService);
         this.canNavigateBackInNavigationsContextKey = ( new RawContextKey("canNavigateBackInNavigationLocations", false, ( localize(
-            14685,
+            15613,
             "Whether it is possible to navigate back in editor navigation locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateForwardInNavigationsContextKey = ( new RawContextKey("canNavigateForwardInNavigationLocations", false, ( localize(
-            14686,
+            15614,
             "Whether it is possible to navigate forward in editor navigation locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateToLastNavigationLocationContextKey = ( new RawContextKey("canNavigateToLastNavigationLocation", false, ( localize(
-            14687,
+            15615,
             "Whether it is possible to navigate to the last editor navigation location"
         )))).bindTo(this.contextKeyService);
         this.canNavigateBackInEditsContextKey = ( new RawContextKey("canNavigateBackInEditLocations", false, ( localize(
-            14688,
+            15616,
             "Whether it is possible to navigate back in editor edit locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateForwardInEditsContextKey = ( new RawContextKey("canNavigateForwardInEditLocations", false, ( localize(
-            14689,
+            15617,
             "Whether it is possible to navigate forward in editor edit locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateToLastEditLocationContextKey = ( new RawContextKey("canNavigateToLastEditLocation", false, ( localize(
-            14690,
+            15618,
             "Whether it is possible to navigate to the last editor edit location"
         )))).bindTo(this.contextKeyService);
-        this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(14691, "Whether it is possible to reopen the last closed editor")))).bindTo(this.contextKeyService);
+        this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(15619, "Whether it is possible to reopen the last closed editor")))).bindTo(this.contextKeyService);
         this.registerListeners();
         if (this.editorService.activeEditorPane) {
             this.onDidActiveEditorChange();

package/vscode/src/vs/workbench/services/progress/browser/progressService.d.ts

@@ -10,6 +10,7 @@ import { IViewDescriptorService } from "@codingame/monaco-vscode-api/vscode/vs/w
 import { IViewsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service";
 import { IPaneCompositePartService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service";
 import { IUserActivityService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/userActivity/common/userActivityService.service";
+import { IHostService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service";
 export declare class ProgressService extends Disposable implements IProgressService {
     private readonly activityService;
     private readonly paneCompositeService;
@@ -20,8 +21,9 @@ export declare class ProgressService extends Disposable implements IProgressServ
     private readonly layoutService;
     private readonly keybindingService;
     private readonly userActivityService;
+    private readonly hostService;
     readonly _serviceBrand: undefined;
-    constructor(activityService: IActivityService, paneCompositeService: IPaneCompositePartService, viewDescriptorService: IViewDescriptorService, viewsService: IViewsService, notificationService: INotificationService, statusbarService: IStatusbarService, layoutService: ILayoutService, keybindingService: IKeybindingService, userActivityService: IUserActivityService);
+    constructor(activityService: IActivityService, paneCompositeService: IPaneCompositePartService, viewDescriptorService: IViewDescriptorService, viewsService: IViewsService, notificationService: INotificationService, statusbarService: IStatusbarService, layoutService: ILayoutService, keybindingService: IKeybindingService, userActivityService: IUserActivityService, hostService: IHostService);
     withProgress<R = unknown>(options: IProgressOptions, originalTask: (progress: IProgress<IProgressStep>) => Promise<R>, onDidCancel?: (choice?: number) => void): Promise<R>;
     private readonly windowProgressStack;
     private windowProgressStatusEntry;

package/vscode/src/vs/workbench/services/progress/browser/progressService.js

@@ -26,7 +26,8 @@ import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/
 import { IPaneCompositePartService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { stripIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iconLabels';
 import { IUserActivityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userActivity/common/userActivityService.service';
-import { createWorkbenchDialogOptions } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/browser/dialog';
+import { createWorkbenchDialogOptions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/dialogs/dialog';
+import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
 registerCss(progressService);
@@ -40,7 +41,8 @@ let ProgressService = class ProgressService extends Disposable {
         statusbarService,
         layoutService,
         keybindingService,
-        userActivityService
+        userActivityService,
+        hostService
     ) {
         super();
         this.activityService = activityService;
@@ -52,6 +54,7 @@ let ProgressService = class ProgressService extends Disposable {
         this.layoutService = layoutService;
         this.keybindingService = keybindingService;
         this.userActivityService = userActivityService;
+        this.hostService = hostService;
         this.windowProgressStack = [];
         this.windowProgressStatusEntry = undefined;
     }
@@ -170,20 +173,20 @@ let ProgressService = class ProgressService extends Disposable {
             let title;
             const source = options.source && typeof options.source !== "string" ? options.source.label : options.source;
             if (progressTitle && progressMessage) {
-                text = ( localize(14820, "{0}: {1}", progressTitle, progressMessage));
-                title = source ? ( localize(14821, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
+                text = ( localize(15747, "{0}: {1}", progressTitle, progressMessage));
+                title = source ? ( localize(15748, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
             } else if (progressTitle) {
                 text = progressTitle;
-                title = source ? ( localize(14822, "[{0}]: {1}", source, progressTitle)) : text;
+                title = source ? ( localize(15749, "[{0}]: {1}", source, progressTitle)) : text;
             } else if (progressMessage) {
                 text = progressMessage;
-                title = source ? ( localize(14822, "[{0}]: {1}", source, progressMessage)) : text;
+                title = source ? ( localize(15749, "[{0}]: {1}", source, progressMessage)) : text;
             } else {
                 this.updateWindowProgress(idx + 1);
                 return;
             }
             const statusEntryProperties = {
-                name: ( localize(14823, "Progress Message")),
+                name: ( localize(15750, "Progress Message")),
                 text,
                 showProgress: options.type || true,
                 ariaLabel: text,
@@ -289,7 +292,7 @@ let ProgressService = class ProgressService extends Disposable {
                     constructor() {
                         super(
                             "progress.cancel",
-                            typeof options.cancellable === "string" ? options.cancellable : ( localize(14824, "Cancel")),
+                            typeof options.cancellable === "string" ? options.cancellable : ( localize(15751, "Cancel")),
                             undefined,
                             true
                         );
@@ -481,7 +484,7 @@ let ProgressService = class ProgressService extends Disposable {
             const buttons = options.buttons || [];
             if (!options.sticky) {
                 buttons.push(
-                    options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(14824, "Cancel")) : options.cancellable) : ( localize(14825, "Dismiss"))
+                    options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(15751, "Cancel")) : options.cancellable) : ( localize(15752, "Dismiss"))
                 );
             }
             dialog = ( new Dialog(
@@ -494,7 +497,7 @@ let ProgressService = class ProgressService extends Disposable {
                     cancelId: buttons.length - 1,
                     disableCloseAction: options.sticky,
                     disableDefaultAction: options.sticky
-                }, this.keybindingService, this.layoutService)
+                }, this.keybindingService, this.layoutService, this.hostService)
             ));
             disposables.add(dialog);
             dialog.show().then(dialogResult => {
@@ -536,6 +539,6 @@ let ProgressService = class ProgressService extends Disposable {
         return promise;
     }
 };
-ProgressService = ( __decorate([( __param(0, IActivityService)), ( __param(1, IPaneCompositePartService)), ( __param(2, IViewDescriptorService)), ( __param(3, IViewsService)), ( __param(4, INotificationService)), ( __param(5, IStatusbarService)), ( __param(6, ILayoutService)), ( __param(7, IKeybindingService)), ( __param(8, IUserActivityService))], ProgressService));
+ProgressService = ( __decorate([( __param(0, IActivityService)), ( __param(1, IPaneCompositePartService)), ( __param(2, IViewDescriptorService)), ( __param(3, IViewsService)), ( __param(4, INotificationService)), ( __param(5, IStatusbarService)), ( __param(6, ILayoutService)), ( __param(7, IKeybindingService)), ( __param(8, IUserActivityService)), ( __param(9, IHostService))], ProgressService));
 
 export { ProgressService };

package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.d.ts

@@ -9,6 +9,7 @@ import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platfo
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ViewContainerModel } from "../common/viewContainerModel.js";
 import { ILoggerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 export declare class ViewDescriptorService extends Disposable implements IViewDescriptorService {
     private readonly instantiationService;
     private readonly contextKeyService;
@@ -61,7 +62,8 @@ export declare class ViewDescriptorService extends Disposable implements IViewDe
     }>;
     get viewContainers(): ReadonlyArray<ViewContainer>;
     private readonly logger;
-    constructor(instantiationService: IInstantiationService, contextKeyService: IContextKeyService, storageService: IStorageService, extensionService: IExtensionService, telemetryService: ITelemetryService, loggerService: ILoggerService);
+    private readonly isSessionsWindow;
+    constructor(instantiationService: IInstantiationService, contextKeyService: IContextKeyService, storageService: IStorageService, extensionService: IExtensionService, telemetryService: ITelemetryService, loggerService: ILoggerService, environmentService: IWorkbenchEnvironmentService);
     private migrateToViewsCustomizationsStorage;
     private registerGroupedViews;
     private deregisterGroupedViews;
@@ -76,11 +78,15 @@ export declare class ViewDescriptorService extends Disposable implements IViewDe
     getViewContainerByViewId(viewId: string): ViewContainer | null;
     getViewContainerLocation(viewContainer: ViewContainer): ViewContainerLocation;
     getDefaultViewContainerLocation(viewContainer: ViewContainer): ViewContainerLocation;
+    private getEffectiveViewContainerLocation;
     getDefaultContainerById(viewId: string): ViewContainer | null;
     getViewContainerModel(container: ViewContainer): ViewContainerModel;
     getViewContainerById(id: string): ViewContainer | null;
     getViewContainersByLocation(location: ViewContainerLocation): ViewContainer[];
+    private isViewContainerVisible;
+    private isViewVisible;
     getDefaultViewContainer(location: ViewContainerLocation): ViewContainer | undefined;
+    canMoveViews(): boolean;
     moveViewContainerToLocation(viewContainer: ViewContainer, location: ViewContainerLocation, requestedIndex?: number, reason?: string): void;
     getViewContainerBadgeEnablementState(id: string): boolean;
     setViewContainerBadgeEnablementState(id: string, badgesEnabled: boolean): void;

package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { VIEWS_LOG_ID, VIEWS_LOG_NAME, Extensions, ViewContainerLocation, ViewVisibilityState, defaultViewIcon, ViewContainerLocationToString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
+import { VIEWS_LOG_ID, VIEWS_LOG_NAME, Extensions, ViewContainerLocation, WindowVisibility, ViewVisibilityState, defaultViewIcon, ViewContainerLocationToString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ContextKeyExpr, RawContextKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
@@ -22,6 +22,7 @@ import { ILoggerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { IViewsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/views/common/viewsService.service';
 import { windowLogGroup } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/log/common/logConstants';
+import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 
 var ViewDescriptorService_1;
 function getViewContainerStorageId(viewContainerId) {
@@ -46,7 +47,8 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         storageService,
         extensionService,
         telemetryService,
-        loggerService
+        loggerService,
+        environmentService
     ) {
         super();
         this.instantiationService = instantiationService;
@@ -69,6 +71,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             name: VIEWS_LOG_NAME,
             group: windowLogGroup
         })));
+        this.isSessionsWindow = environmentService.isSessionsWindow;
         this.activeViewContextKeys = ( new Map());
         this.movableViewContextKeys = ( new Map());
         this.defaultViewLocationContextKeys = ( new Map());
@@ -259,7 +262,11 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         return viewsByContainer;
     }
     getViewDescriptorById(viewId) {
-        return this.viewsRegistry.getView(viewId);
+        const view = this.viewsRegistry.getView(viewId);
+        if (view && !this.isViewVisible(view)) {
+            return null;
+        }
+        return view;
     }
     getViewLocationById(viewId) {
         const container = this.getViewContainerByViewId(viewId);
@@ -269,14 +276,25 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         return this.getViewContainerLocation(container);
     }
     getViewContainerByViewId(viewId) {
+        const view = this.viewsRegistry.getView(viewId);
+        if (view && !this.isViewVisible(view)) {
+            return null;
+        }
         const containerId = this.viewDescriptorsCustomLocations.get(viewId);
         return containerId ? this.viewContainersRegistry.get(containerId) ?? null : this.getDefaultContainerById(viewId);
     }
     getViewContainerLocation(viewContainer) {
-        return this.viewContainersCustomLocations.get(viewContainer.id) ?? this.getDefaultViewContainerLocation(viewContainer);
+        const location = this.viewContainersCustomLocations.get(viewContainer.id) ?? this.getDefaultViewContainerLocation(viewContainer);
+        return this.getEffectiveViewContainerLocation(location);
     }
     getDefaultViewContainerLocation(viewContainer) {
-        return this.viewContainersRegistry.getViewContainerLocation(viewContainer);
+        return this.getEffectiveViewContainerLocation(this.viewContainersRegistry.getViewContainerLocation(viewContainer));
+    }
+    getEffectiveViewContainerLocation(location) {
+        if (!this.isSessionsWindow && location === ViewContainerLocation.ChatBar) {
+            return ViewContainerLocation.AuxiliaryBar;
+        }
+        return location;
     }
     getDefaultContainerById(viewId) {
         return this.viewsRegistry.getViewContainer(viewId) ?? null;
@@ -285,15 +303,42 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         return this.getOrRegisterViewContainerModel(container);
     }
     getViewContainerById(id) {
-        return this.viewContainersRegistry.get(id) || null;
+        const viewContainer = this.viewContainersRegistry.get(id) || null;
+        if (viewContainer && !this.isViewContainerVisible(viewContainer)) {
+            return null;
+        }
+        return viewContainer;
     }
     getViewContainersByLocation(location) {
-        return this.viewContainers.filter(v => this.getViewContainerLocation(v) === location);
+        return this.viewContainers.filter(
+            v => this.getViewContainerLocation(v) === location && this.isViewContainerVisible(v)
+        );
+    }
+    isViewContainerVisible(viewContainer) {
+        const layoutVisibility = viewContainer.windowVisibility;
+        if (this.isSessionsWindow) {
+            return layoutVisibility === WindowVisibility.Sessions || layoutVisibility === WindowVisibility.Both;
+        }
+        return !layoutVisibility || layoutVisibility === WindowVisibility.Editor || layoutVisibility === WindowVisibility.Both;
+    }
+    isViewVisible(view) {
+        const layoutVisibility = view.windowVisibility;
+        if (this.isSessionsWindow) {
+            return layoutVisibility === WindowVisibility.Sessions || layoutVisibility === WindowVisibility.Both;
+        }
+        return !layoutVisibility || layoutVisibility === WindowVisibility.Editor || layoutVisibility === WindowVisibility.Both;
     }
     getDefaultViewContainer(location) {
-        return this.viewContainersRegistry.getDefaultViewContainer(location);
+        const viewContainers = this.viewContainersRegistry.getDefaultViewContainers(location);
+        return viewContainers.find(viewContainer => this.isViewContainerVisible(viewContainer));
+    }
+    canMoveViews() {
+        return !this.isSessionsWindow;
     }
     moveViewContainerToLocation(viewContainer, location, requestedIndex, reason) {
+        if (!this.canMoveViews()) {
+            return;
+        }
         this.logger.value.trace(
             `moveViewContainerToLocation: viewContainer:${viewContainer.id} location:${location} reason:${reason}`
         );
@@ -308,6 +353,9 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         this.saveViewCustomizations();
     }
     moveViewToLocation(view, location, reason) {
+        if (!this.canMoveViews()) {
+            return;
+        }
         this.logger.value.trace(
             `moveViewToLocation: view:${view.id} location:${location} reason:${reason}`
         );
@@ -318,6 +366,9 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         if (!views.length) {
             return;
         }
+        if (!this.canMoveViews()) {
+            return;
+        }
         this.logger.value.trace(`moveViewsToContainer: views:${( views.map(view => view.id)).join(",")} viewContainer:${viewContainer.id} reason:${reason}`);
         const from = this.getViewContainerByViewId(views[0].id);
         const to = viewContainer;
@@ -458,7 +509,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                 mergeViewWithContainerWhenSingleView: true
             }])),
             title: {
-                value: ( localize(15199, "User View Container")),
+                value: ( localize(16126, "User View Container")),
                 original: "User View Container"
             },
             icon: location === ViewContainerLocation.Sidebar ? defaultViewIcon : undefined,
@@ -597,9 +648,15 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         }
     }
     getStoredViewCustomizationsValue() {
+        if (this.isSessionsWindow) {
+            return "{}";
+        }
         return this.storageService.get(ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS, StorageScope.PROFILE, "{}");
     }
     setStoredViewCustomizationsValue(value) {
+        if (this.isSessionsWindow) {
+            return;
+        }
         this.storageService.store(
             ViewDescriptorService_1.VIEWS_CUSTOMIZATIONS,
             value,
@@ -765,7 +822,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                             title: viewDescriptor.name,
                             metadata: {
                                 description: ( localize2(
-                                    15200,
+                                    16127,
                                     "Toggles the visibility of the {0} view if the view container it is located in is visible",
                                     viewDescriptor.name.value
                                 ))
@@ -796,10 +853,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                         super({
                             id: `${viewDescriptor.id}.removeView`,
                             viewPaneContainerId: viewContainerModel.viewContainer.id,
-                            title: ( localize(15201, "Hide '{0}'", viewDescriptor.name.value)),
+                            title: ( localize(16128, "Hide '{0}'", viewDescriptor.name.value)),
                             metadata: {
                                 description: ( localize2(
-                                    15202,
+                                    16129,
                                     "Hides the {0} view if it is visible and the view container it is located in is visible",
                                     viewDescriptor.name.value
                                 ))
@@ -829,7 +886,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             constructor() {
                 super({
                     id: `${viewContainer.id}.resetViewContainerLocation`,
-                    title: ( localize2(15203, "Reset Location")),
+                    title: ( localize2(16130, "Reset Location")),
                     menu: [{
                         id: MenuId.ViewContainerTitleContext,
                         group: "1_viewActions",
@@ -925,6 +982,6 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         return contextKey;
     }
 };
-ViewDescriptorService = ViewDescriptorService_1 = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IContextKeyService)), ( __param(2, IStorageService)), ( __param(3, IExtensionService)), ( __param(4, ITelemetryService)), ( __param(5, ILoggerService))], ViewDescriptorService));
+ViewDescriptorService = ViewDescriptorService_1 = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IContextKeyService)), ( __param(2, IStorageService)), ( __param(3, IExtensionService)), ( __param(4, ITelemetryService)), ( __param(5, ILoggerService)), ( __param(6, IWorkbenchEnvironmentService))], ViewDescriptorService));
 
 export { ViewDescriptorService };