@codingame/monaco-vscode-view-common-service-override 31.0.0 → 32.0.0

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, WindowVisibility, ViewVisibilityState, defaultViewIcon, ViewContainerLocationToString } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
+import { VIEWS_LOG_ID, VIEWS_LOG_NAME, Extensions, ViewContainerLocation, WindowEnablement, 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';
@@ -39,7 +39,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         this.COMMON_CONTAINER_ID_PREFIX = "workbench.views.service";
     }
     get viewContainers() {
-        return this.viewContainersRegistry.all;
+        return this.viewContainersRegistry.all.filter(vc => this.isViewContainerEnabled(vc));
     }
     constructor(
         instantiationService,
@@ -104,6 +104,9 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                 viewContainer
             }
         ) => {
+            if (!this.isViewContainerEnabled(viewContainer)) {
+                return;
+            }
             this.onDidRegisterViewContainer(viewContainer);
             this._onDidChangeViewContainers.fire({
                 added: [{
@@ -119,6 +122,9 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                 viewContainerLocation
             }
         ) => {
+            if (!this.isViewContainerEnabled(viewContainer)) {
+                return;
+            }
             this.onDidDeregisterViewContainer(viewContainer);
             this._onDidChangeViewContainers.fire({
                 removed: [{
@@ -173,7 +179,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
     }
     registerGroupedViews(groupedViews) {
         for (const [containerId, views] of groupedViews.entries()) {
-            const viewContainer = this.viewContainersRegistry.get(containerId);
+            const viewContainer = this.getViewContainerById(containerId);
             if (!viewContainer || !( this.viewContainerModels.has(viewContainer))) {
                 if (this.isGeneratedContainerId(containerId)) {
                     const viewContainerLocation = this.viewContainersCustomLocations.get(containerId);
@@ -191,7 +197,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
     }
     deregisterGroupedViews(groupedViews) {
         for (const [viewContainerId, views] of groupedViews.entries()) {
-            const viewContainer = this.viewContainersRegistry.get(viewContainerId);
+            const viewContainer = this.getViewContainerById(viewContainerId);
             if (!viewContainer || !( this.viewContainerModels.has(viewContainer))) {
                 continue;
             }
@@ -200,7 +206,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
     }
     moveOrphanViewsToDefaultLocation() {
         for (const [viewId, containerId] of this.viewDescriptorsCustomLocations.entries()) {
-            if (this.viewContainersRegistry.get(containerId)) {
+            if (this.getViewContainerById(containerId)) {
                 continue;
             }
             const viewContainer = this.viewsRegistry.getViewContainer(viewId);
@@ -263,7 +269,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
     }
     getViewDescriptorById(viewId) {
         const view = this.viewsRegistry.getView(viewId);
-        if (view && !this.isViewVisible(view)) {
+        if (view && !this.isViewEnabled(view)) {
             return null;
         }
         return view;
@@ -277,11 +283,11 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
     }
     getViewContainerByViewId(viewId) {
         const view = this.viewsRegistry.getView(viewId);
-        if (view && !this.isViewVisible(view)) {
+        if (view && !this.isViewEnabled(view)) {
             return null;
         }
         const containerId = this.viewDescriptorsCustomLocations.get(viewId);
-        return containerId ? this.viewContainersRegistry.get(containerId) ?? null : this.getDefaultContainerById(viewId);
+        return containerId ? this.getViewContainerById(containerId) : this.getDefaultContainerById(viewId);
     }
     getViewContainerLocation(viewContainer) {
         const location = this.viewContainersCustomLocations.get(viewContainer.id) ?? this.getDefaultViewContainerLocation(viewContainer);
@@ -303,34 +309,26 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
         return this.getOrRegisterViewContainerModel(container);
     }
     getViewContainerById(id) {
-        const viewContainer = this.viewContainersRegistry.get(id) || null;
-        if (viewContainer && !this.isViewContainerVisible(viewContainer)) {
-            return null;
-        }
-        return viewContainer;
+        return this.viewContainers.find(vc => vc.id === id) ?? null;
     }
     getViewContainersByLocation(location) {
-        return this.viewContainers.filter(
-            v => this.getViewContainerLocation(v) === location && this.isViewContainerVisible(v)
-        );
+        return this.viewContainers.filter(v => this.getViewContainerLocation(v) === location);
     }
-    isViewContainerVisible(viewContainer) {
-        const layoutVisibility = viewContainer.windowVisibility;
-        if (this.isSessionsWindow) {
-            return layoutVisibility === WindowVisibility.Sessions || layoutVisibility === WindowVisibility.Both;
-        }
-        return !layoutVisibility || layoutVisibility === WindowVisibility.Editor || layoutVisibility === WindowVisibility.Both;
+    isViewContainerEnabled(viewContainer) {
+        return this.isEnabled(viewContainer.windowEnablement);
+    }
+    isViewEnabled(view) {
+        return this.isEnabled(view.windowEnablement);
     }
-    isViewVisible(view) {
-        const layoutVisibility = view.windowVisibility;
+    isEnabled(enablement) {
         if (this.isSessionsWindow) {
-            return layoutVisibility === WindowVisibility.Sessions || layoutVisibility === WindowVisibility.Both;
+            return enablement === WindowEnablement.Sessions || enablement === WindowEnablement.Both;
         }
-        return !layoutVisibility || layoutVisibility === WindowVisibility.Editor || layoutVisibility === WindowVisibility.Both;
+        return !enablement || enablement === WindowEnablement.Editor || enablement === WindowEnablement.Both;
     }
     getDefaultViewContainer(location) {
         const viewContainers = this.viewContainersRegistry.getDefaultViewContainers(location);
-        return viewContainers.find(viewContainer => this.isViewContainerVisible(viewContainer));
+        return viewContainers.find(viewContainer => this.isViewContainerEnabled(viewContainer));
     }
     canMoveViews() {
         return !this.isSessionsWindow;
@@ -509,7 +507,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                 mergeViewWithContainerWhenSingleView: true
             }])),
             title: {
-                value: ( localize(16926, "User View Container")),
+                value: ( localize(17235, "User View Container")),
                 original: "User View Container"
             },
             icon: location === ViewContainerLocation.Sidebar ? defaultViewIcon : undefined,
@@ -559,7 +557,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             const viewDescriptor = this.getViewDescriptorById(viewId);
             if (viewDescriptor) {
                 const prevViewContainer = this.getViewContainerByViewId(viewId);
-                const newViewContainer = this.viewContainersRegistry.get(viewContainerId);
+                const newViewContainer = this.getViewContainerById(viewContainerId);
                 if (prevViewContainer && newViewContainer && newViewContainer !== prevViewContainer) {
                     viewsToMove.push({
                         views: [viewDescriptor],
@@ -822,7 +820,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                             title: viewDescriptor.name,
                             metadata: {
                                 description: ( localize2(
-                                    16927,
+                                    17236,
                                     "Toggles the visibility of the {0} view if the view container it is located in is visible",
                                     viewDescriptor.name.value
                                 ))
@@ -853,10 +851,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                         super({
                             id: `${viewDescriptor.id}.removeView`,
                             viewPaneContainerId: viewContainerModel.viewContainer.id,
-                            title: ( localize(16928, "Hide '{0}'", viewDescriptor.name.value)),
+                            title: ( localize(17237, "Hide '{0}'", viewDescriptor.name.value)),
                             metadata: {
                                 description: ( localize2(
-                                    16929,
+                                    17238,
                                     "Hides the {0} view if it is visible and the view container it is located in is visible",
                                     viewDescriptor.name.value
                                 ))
@@ -886,7 +884,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             constructor() {
                 super({
                     id: `${viewContainer.id}.resetViewContainerLocation`,
-                    title: ( localize2(16930, "Reset Location")),
+                    title: ( localize2(17239, "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(16931, "Text Editor")) : undefined;
+        const textEditorFocused = this.editorService.activeTextEditorControl?.hasTextFocus() ? ( localize(17240, "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(16932, "Show {0}", localizedTitle)),
+                                    value: ( localize(17241, "Show {0}", localizedTitle)),
                                     original: `Show ${originalTitle}`
                                 };
                             } else {
                                 return {
-                                    value: ( localize(16933, "Toggle {0}", localizedTitle)),
+                                    value: ( localize(17242, "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(16932, "Show {0}", localizedTitle)),
+                                value: ( localize(17241, "Show {0}", localizedTitle)),
                                 original: `Show ${originalTitle}`
                             };
                         } else {
                             return {
-                                value: ( localize(16933, "Toggle {0}", localizedTitle)),
+                                value: ( localize(17242, "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(16934, "Opens view {0}", viewDescriptor.name.value)),
+                        description: ( localize(17243, "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(16935, "Whether to preserve the existing focus when opening the view."))
+                                        description: ( localize(17244, "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(16936, "Focus on {0} View", viewDescriptor.name.value));
+                const title = ( localize2(17245, "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(16937, "Reset Location")),
+                    title: ( localize2(17246, "Reset Location")),
                     menu: [{
                         id: MenuId.ViewTitleContext,
                         when: ( ContextKeyExpr.or(( ContextKeyExpr.and(( ContextKeyExpr.equals("view", viewDescriptor.id)), ( ContextKeyExpr.equals(`${viewDescriptor.id}.defaultViewLocation`, false)))))),