@codingame/monaco-vscode-view-common-service-override 33.0.9 → 34.0.1

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, WindowEnablement, ViewVisibilityState, defaultViewIcon, ViewContainerLocationToString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
+import { VIEWS_LOG_ID, VIEWS_LOG_NAME, Extensions, WindowEnablement, ViewContainerLocation, 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';
@@ -290,17 +290,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         return containerId ? this.getViewContainerById(containerId) : this.getDefaultContainerById(viewId);
     }
     getViewContainerLocation(viewContainer) {
-        const location = this.viewContainersCustomLocations.get(viewContainer.id) ?? this.getDefaultViewContainerLocation(viewContainer);
-        return this.getEffectiveViewContainerLocation(location);
+        return this.viewContainersCustomLocations.get(viewContainer.id) ?? this.getDefaultViewContainerLocation(viewContainer);
     }
     getDefaultViewContainerLocation(viewContainer) {
-        return this.getEffectiveViewContainerLocation(this.viewContainersRegistry.getViewContainerLocation(viewContainer));
-    }
-    getEffectiveViewContainerLocation(location) {
-        if (!this.isSessionsWindow && location === ViewContainerLocation.ChatBar) {
-            return ViewContainerLocation.AuxiliaryBar;
-        }
-        return location;
+        return this.viewContainersRegistry.getViewContainerLocation(viewContainer);
     }
     getDefaultContainerById(viewId) {
         return this.viewsRegistry.getViewContainer(viewId) ?? null;
@@ -507,7 +500,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                 mergeViewWithContainerWhenSingleView: true
             }])),
             title: {
-                value: ( localize(17392, "User View Container")),
+                value: ( localize(17607, "User View Container")),
                 original: "User View Container"
             },
             icon: location === ViewContainerLocation.Sidebar ? defaultViewIcon : undefined,
@@ -820,7 +813,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                             title: viewDescriptor.name,
                             metadata: {
                                 description: ( localize2(
-                                    17393,
+                                    17608,
                                     "Toggles the visibility of the {0} view if the view container it is located in is visible",
                                     viewDescriptor.name.value
                                 ))
@@ -851,10 +844,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                         super({
                             id: `${viewDescriptor.id}.removeView`,
                             viewPaneContainerId: viewContainerModel.viewContainer.id,
-                            title: ( localize(17394, "Hide '{0}'", viewDescriptor.name.value)),
+                            title: ( localize(17609, "Hide '{0}'", viewDescriptor.name.value)),
                             metadata: {
                                 description: ( localize2(
-                                    17395,
+                                    17610,
                                     "Hides the {0} view if it is visible and the view container it is located in is visible",
                                     viewDescriptor.name.value
                                 ))
@@ -884,7 +877,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             constructor() {
                 super({
                     id: `${viewContainer.id}.resetViewContainerLocation`,
-                    title: ( localize2(17396, "Reset Location")),
+                    title: ( localize2(17611, "Reset Location")),
                     menu: [{
                         id: MenuId.ViewContainerTitleContext,
                         group: "1_viewActions",

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

@@ -285,7 +285,7 @@ let ViewsService = class ViewsService extends Disposable {
         return this.viewDescriptorService.getViewDescriptorById(( viewId.toString()));
     }
     getFocusedViewName() {
-        const textEditorFocused = this.editorService.activeTextEditorControl?.hasTextFocus() ? ( localize(17397, "Text Editor")) : undefined;
+        const textEditorFocused = this.editorService.activeTextEditorControl?.hasTextFocus() ? ( localize(17612, "Text Editor")) : undefined;
         return this.getFocusedView()?.name?.value ?? textEditorFocused ?? "";
     }
     async openView(id, focus) {
@@ -391,12 +391,12 @@ let ViewsService = class ViewsService extends Disposable {
                             const originalTitle = typeof title === "string" ? title : title.original;
                             if (viewContainerLocation === ViewContainerLocation.Sidebar) {
                                 return {
-                                    value: ( localize(17398, "Show {0}", localizedTitle)),
+                                    value: ( localize(17613, "Show {0}", localizedTitle)),
                                     original: `Show ${originalTitle}`
                                 };
                             } else {
                                 return {
-                                    value: ( localize(17399, "Toggle {0}", localizedTitle)),
+                                    value: ( localize(17614, "Toggle {0}", localizedTitle)),
                                     original: `Toggle ${originalTitle}`
                                 };
                             }
@@ -468,12 +468,12 @@ let ViewsService = class ViewsService extends Disposable {
                         const originalTitle = typeof title === "string" ? title : title.original;
                         if (viewContainerLocation === ViewContainerLocation.Sidebar) {
                             return {
-                                value: ( localize(17398, "Show {0}", localizedTitle)),
+                                value: ( localize(17613, "Show {0}", localizedTitle)),
                                 original: `Show ${originalTitle}`
                             };
                         } else {
                             return {
-                                value: ( localize(17399, "Toggle {0}", localizedTitle)),
+                                value: ( localize(17614, "Toggle {0}", localizedTitle)),
                                 original: `Toggle ${originalTitle}`
                             };
                         }
@@ -486,7 +486,7 @@ let ViewsService = class ViewsService extends Disposable {
                     } : undefined,
                     f1: viewDescriptor.openCommandActionDescriptor ? true : undefined,
                     metadata: {
-                        description: ( localize(17400, "Opens view {0}", viewDescriptor.name.value)),
+                        description: ( localize(17615, "Opens view {0}", viewDescriptor.name.value)),
                         args: [{
                             name: "options",
                             schema: {
@@ -495,7 +495,7 @@ let ViewsService = class ViewsService extends Disposable {
                                     "preserveFocus": {
                                         type: "boolean",
                                         default: false,
-                                        description: ( localize(17401, "Whether to preserve the existing focus when opening the view."))
+                                        description: ( localize(17616, "Whether to preserve the existing focus when opening the view."))
                                     }
                                 }
                             }
@@ -542,7 +542,7 @@ let ViewsService = class ViewsService extends Disposable {
     registerFocusViewAction(viewDescriptor, category) {
         return registerAction2(class FocusViewAction extends Action2 {
             constructor() {
-                const title = ( localize2(17402, "Focus on {0} View", viewDescriptor.name.value));
+                const title = ( localize2(17617, "Focus on {0} View", viewDescriptor.name.value));
                 super({
                     id: viewDescriptor.focusCommand ? viewDescriptor.focusCommand.id : `${viewDescriptor.id}.focus`,
                     title,
@@ -588,7 +588,7 @@ let ViewsService = class ViewsService extends Disposable {
             constructor() {
                 super({
                     id: `${viewDescriptor.id}.resetViewLocation`,
-                    title: ( localize2(17403, "Reset Location")),
+                    title: ( localize2(17618, "Reset Location")),
                     menu: [{
                         id: MenuId.ViewTitleContext,
                         when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.equals("view", viewDescriptor.id)), ( ContextKeyExpr.equals(`${viewDescriptor.id}.defaultViewLocation`, false)))))),