@codingame/monaco-vscode-view-common-service-override 20.4.1 → 21.0.0

package/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js

@@ -11,7 +11,7 @@ import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/regist
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { Extensions as Extensions$1 } from '@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common/vscode/vs/workbench/browser/panecomposite';
 import { CustomTreeView, TreeViewPane } from '@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common/vscode/vs/workbench/browser/parts/views/treeView';
-import { ViewPaneContainer } from '@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
+import { ViewPaneContainer } from '@codingame/monaco-vscode-71c8dbff-4c98-552f-aef0-e72b00fdcfc0-common/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
 import { Extensions, ViewContainerLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/views';
 import { VIEWLET_ID as VIEWLET_ID$3 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/debug/common/debug';
@@ -19,7 +19,7 @@ import { VIEWLET_ID as VIEWLET_ID$1 } from '@codingame/monaco-vscode-f24e325c-2c
 import { VIEWLET_ID } from '@codingame/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common/vscode/vs/workbench/contrib/remote/browser/remoteExplorer';
 import { VIEWLET_ID as VIEWLET_ID$2 } from '@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common/vscode/vs/workbench/contrib/scm/common/scm';
 import { WebviewViewPane } from '../../contrib/webviewView/browser/webviewViewPane.js';
-import { isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
+import { checkProposedApiEnabled, isProposedApiEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { Extensions as Extensions$2 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
@@ -31,19 +31,19 @@ const viewsContainerSchema = {
     properties: {
         id: {
             description: ( localize(
-                2521,
+                2525,
                 "Unique id used to identify the container in which views can be contributed using 'views' contribution point"
             )),
             type: 'string',
             pattern: '^[a-zA-Z0-9_-]+$'
         },
         title: {
-            description: ( localize(2522, 'Human readable string used to render the container')),
+            description: ( localize(2526, 'Human readable string used to render the container')),
             type: 'string'
         },
         icon: {
             description: ( localize(
-                2523,
+                2527,
                 "Path to the container icon. Icons are 24x24 centered on a 50x40 block and have a fill color of 'rgb(215, 218, 224)' or '#d7dae0'. It is recommended that icons be in SVG, though any image file type is accepted."
             )),
             type: 'string'
@@ -52,16 +52,21 @@ const viewsContainerSchema = {
     required: ['id', 'title', 'icon']
 };
 const viewsContainersContribution = {
-    description: ( localize(2524, 'Contributes views containers to the editor')),
+    description: ( localize(2528, 'Contributes views containers to the editor')),
     type: 'object',
     properties: {
         'activitybar': {
-            description: ( localize(2525, "Contribute views containers to Activity Bar")),
+            description: ( localize(2529, "Contribute views containers to Activity Bar")),
             type: 'array',
             items: viewsContainerSchema
         },
         'panel': {
-            description: ( localize(2526, "Contribute views containers to Panel")),
+            description: ( localize(2530, "Contribute views containers to Panel")),
+            type: 'array',
+            items: viewsContainerSchema
+        },
+        'secondarySidebar': {
+            description: ( localize(2531, "Contribute views containers to Secondary Side Bar")),
             type: 'array',
             items: viewsContainerSchema
         }
@@ -86,7 +91,7 @@ const viewDescriptor = {
     properties: {
         type: {
             markdownDescription: ( localize(
-                2527,
+                2532,
                 "Type of the view. This can either be `tree` for a tree view based view or `webview` for a webview based view. The default is `tree`."
             )),
             type: 'string',
@@ -95,45 +100,45 @@ const viewDescriptor = {
                 'webview',
             ],
             markdownEnumDescriptions: [
-                ( localize(2528, "The view is backed by a `TreeView` created by `createTreeView`.")),
+                ( localize(2533, "The view is backed by a `TreeView` created by `createTreeView`.")),
                 ( localize(
-                2529,
+                2534,
                 "The view is backed by a `WebviewView` registered by `registerWebviewViewProvider`."
             )),
             ]
         },
         id: {
             markdownDescription: ( localize(
-                2530,
+                2535,
                 'Identifier of the view. This should be unique across all views. It is recommended to include your extension id as part of the view id. Use this to register a data provider through `vscode.window.registerTreeDataProviderForView` API. Also to trigger activating your extension by registering `onView:${id}` event to `activationEvents`.'
             )),
             type: 'string'
         },
         name: {
-            description: ( localize(2531, 'The human-readable name of the view. Will be shown')),
+            description: ( localize(2536, 'The human-readable name of the view. Will be shown')),
             type: 'string'
         },
         when: {
-            description: ( localize(2532, 'Condition which must be true to show this view')),
+            description: ( localize(2537, 'Condition which must be true to show this view')),
             type: 'string'
         },
         icon: {
             description: ( localize(
-                2533,
+                2538,
                 "Path to the view icon. View icons are displayed when the name of the view cannot be shown. It is recommended that icons be in SVG, though any image file type is accepted."
             )),
             type: 'string'
         },
         contextualTitle: {
             description: ( localize(
-                2534,
+                2539,
                 "Human-readable context for when the view is moved out of its original location. By default, the view's container name will be used."
             )),
             type: 'string'
         },
         visibility: {
             description: ( localize(
-                2535,
+                2540,
                 "Initial state of the view when the extension is first installed. Once the user has changed the view state by collapsing, moving, or hiding the view, the initial state will not be used again."
             )),
             type: 'string',
@@ -145,27 +150,27 @@ const viewDescriptor = {
             default: 'visible',
             enumDescriptions: [
                 ( localize(
-                2536,
+                2541,
                 "The default initial state for the view. In most containers the view will be expanded, however; some built-in containers (explorer, scm, and debug) show all contributed views collapsed regardless of the `visibility`."
             )),
                 ( localize(
-                2537,
+                2542,
                 "The view will not be shown in the view container, but will be discoverable through the views menu and other view entry points and can be un-hidden by the user."
             )),
-                ( localize(2538, "The view will show in the view container, but will be collapsed."))
+                ( localize(2543, "The view will show in the view container, but will be collapsed."))
             ]
         },
         initialSize: {
             type: 'number',
             description: ( localize(
-                2539,
+                2544,
                 "The initial size of the view. The size will behave like the css 'flex' property, and will set the initial size when the view is first shown. In the side bar, this is the height of the view. This value is only respected when the same extension owns both the view and the view container."
             )),
         },
         accessibilityHelpContent: {
             type: 'string',
             markdownDescription: ( localize(
-                2540,
+                2545,
                 "When the accessibility help dialog is invoked in this view, this content will be presented to the user as a markdown string. Keybindings will be resolved when provided in the format of <keybinding:commandId>. If there is no keybinding, that will be indicated and this command will be included in a quickpick for easy configuration."
             ))
         }
@@ -177,25 +182,25 @@ const remoteViewDescriptor = {
     properties: {
         id: {
             description: ( localize(
-                2530,
+                2535,
                 'Identifier of the view. This should be unique across all views. It is recommended to include your extension id as part of the view id. Use this to register a data provider through `vscode.window.registerTreeDataProviderForView` API. Also to trigger activating your extension by registering `onView:${id}` event to `activationEvents`.'
             )),
             type: 'string'
         },
         name: {
-            description: ( localize(2531, 'The human-readable name of the view. Will be shown')),
+            description: ( localize(2536, 'The human-readable name of the view. Will be shown')),
             type: 'string'
         },
         when: {
-            description: ( localize(2532, 'Condition which must be true to show this view')),
+            description: ( localize(2537, 'Condition which must be true to show this view')),
             type: 'string'
         },
         group: {
-            description: ( localize(2541, 'Nested group in the viewlet')),
+            description: ( localize(2546, 'Nested group in the viewlet')),
             type: 'string'
         },
         remoteName: {
-            description: ( localize(2542, 'The name of the remote type associated with this view')),
+            description: ( localize(2547, 'The name of the remote type associated with this view')),
             type: ['string', 'array'],
             items: {
                 type: 'string'
@@ -204,36 +209,36 @@ const remoteViewDescriptor = {
     }
 };
 const viewsContribution = {
-    description: ( localize(2543, "Contributes views to the editor")),
+    description: ( localize(2548, "Contributes views to the editor")),
     type: 'object',
     properties: {
         'explorer': {
-            description: ( localize(2544, "Contributes views to Explorer container in the Activity bar")),
+            description: ( localize(2549, "Contributes views to Explorer container in the Activity bar")),
             type: 'array',
             items: viewDescriptor,
             default: []
         },
         'debug': {
-            description: ( localize(2545, "Contributes views to Debug container in the Activity bar")),
+            description: ( localize(2550, "Contributes views to Debug container in the Activity bar")),
             type: 'array',
             items: viewDescriptor,
             default: []
         },
         'scm': {
-            description: ( localize(2546, "Contributes views to SCM container in the Activity bar")),
+            description: ( localize(2551, "Contributes views to SCM container in the Activity bar")),
             type: 'array',
             items: viewDescriptor,
             default: []
         },
         'test': {
-            description: ( localize(2547, "Contributes views to Test container in the Activity bar")),
+            description: ( localize(2552, "Contributes views to Test container in the Activity bar")),
             type: 'array',
             items: viewDescriptor,
             default: []
         },
         'remote': {
             description: ( localize(
-                2548,
+                2553,
                 "Contributes views to Remote container in the Activity bar. To contribute to this container, enableProposedApi needs to be turned on"
             )),
             type: 'array',
@@ -242,7 +247,7 @@ const viewsContribution = {
         }
     },
     additionalProperties: {
-        description: ( localize(2549, "Contributes views to contributed views container")),
+        description: ( localize(2554, "Contributes views to contributed views container")),
         type: 'array',
         items: viewDescriptor,
         default: []
@@ -293,6 +298,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
         const viewContainersRegistry = ( Registry.as(Extensions.ViewContainersRegistry));
         let activityBarOrder = CUSTOM_VIEWS_START_ORDER + viewContainersRegistry.all.filter(v => !!v.extensionId && viewContainersRegistry.getViewContainerLocation(v) === ViewContainerLocation.Sidebar).length;
         let panelOrder = 5 + viewContainersRegistry.all.filter(v => !!v.extensionId && viewContainersRegistry.getViewContainerLocation(v) === ViewContainerLocation.Panel).length + 1;
+        let auxiliaryBarOrder = 100 + viewContainersRegistry.all.filter(v => !!v.extensionId && viewContainersRegistry.getViewContainerLocation(v) === ViewContainerLocation.AuxiliaryBar).length + 1;
         for (const { value, collector, description } of extensionPoints) {
             Object.entries(value).forEach(([key, value]) => {
                 if (!this.isValidViewsContainer(value, collector)) {
@@ -305,6 +311,10 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
                     case 'panel':
                         panelOrder = this.registerCustomViewContainers(value, description, panelOrder, existingViewContainers, ViewContainerLocation.Panel);
                         break;
+                    case 'secondarySidebar':
+                        checkProposedApiEnabled(description, 'contribSecondarySidebar');
+                        auxiliaryBarOrder = this.registerCustomViewContainers(value, description, auxiliaryBarOrder, existingViewContainers, ViewContainerLocation.AuxiliaryBar);
+                        break;
                 }
             });
         }
@@ -324,13 +334,13 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
     }
     isValidViewsContainer(viewsContainersDescriptors, collector) {
         if (!Array.isArray(viewsContainersDescriptors)) {
-            collector.error(( localize(2550, "views containers must be an array")));
+            collector.error(( localize(2555, "views containers must be an array")));
             return false;
         }
         for (const descriptor of viewsContainersDescriptors) {
             if (typeof descriptor.id !== 'string' && isFalsyOrWhitespace(descriptor.id)) {
                 collector.error(( localize(
-                    2551,
+                    2556,
                     "property `{0}` is mandatory and must be of type `string` with non-empty value. Only alphanumeric characters, '_', and '-' are allowed.",
                     'id'
                 )));
@@ -338,23 +348,23 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
             }
             if (!(/^[a-z0-9_-]+$/i.test(descriptor.id))) {
                 collector.error(( localize(
-                    2551,
+                    2556,
                     "property `{0}` is mandatory and must be of type `string` with non-empty value. Only alphanumeric characters, '_', and '-' are allowed.",
                     'id'
                 )));
                 return false;
             }
             if (typeof descriptor.title !== 'string') {
-                collector.error(( localize(2552, "property `{0}` is mandatory and must be of type `string`", 'title')));
+                collector.error(( localize(2557, "property `{0}` is mandatory and must be of type `string`", 'title')));
                 return false;
             }
             if (typeof descriptor.icon !== 'string') {
-                collector.error(( localize(2552, "property `{0}` is mandatory and must be of type `string`", 'icon')));
+                collector.error(( localize(2557, "property `{0}` is mandatory and must be of type `string`", 'icon')));
                 return false;
             }
             if (isFalsyOrWhitespace(descriptor.title)) {
                 collector.warn(( localize(
-                    2553,
+                    2558,
                     "property `{0}` is mandatory and must be of type `string` with non-empty value",
                     'title'
                 )));
@@ -424,7 +434,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
                 }
                 if (key === 'remote' && !isProposedApiEnabled(extension.description, 'contribViewsRemote')) {
                     collector.warn(( localize(
-                        2554,
+                        2559,
                         "View container '{0}' requires 'enabledApiProposals: [\"contribViewsRemote\"]' to be added to 'Remote'.",
                         key
                     )));
@@ -433,7 +443,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
                 const viewContainer = this.getViewContainer(key);
                 if (!viewContainer) {
                     collector.warn(( localize(
-                        2555,
+                        2560,
                         "View container '{0}' does not exist and all views registered to it will be added to 'Explorer'.",
                         key
                     )));
@@ -443,11 +453,11 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
                 for (let index = 0; index < value.length; index++) {
                     const item = value[index];
                     if (( viewIds.has(item.id))) {
-                        collector.error(( localize(2556, "Cannot register multiple views with same id `{0}`", item.id)));
+                        collector.error(( localize(2561, "Cannot register multiple views with same id `{0}`", item.id)));
                         continue;
                     }
                     if (this.viewsRegistry.getView(item.id) !== null) {
-                        collector.error(( localize(2557, "A view with id `{0}` is already registered.", item.id)));
+                        collector.error(( localize(2562, "A view with id `{0}` is already registered.", item.id)));
                         continue;
                     }
                     const order = ExtensionIdentifier.equals(extension.description.identifier, container.extensionId)
@@ -462,7 +472,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
                     const initialVisibility = this.convertInitialVisibility(item.visibility);
                     const type = this.getViewType(item.type);
                     if (!type) {
-                        collector.error(( localize(2558, "Unknown view type `{0}`.", item.type)));
+                        collector.error(( localize(2563, "Unknown view type `{0}`.", item.type)));
                         continue;
                     }
                     let weight = undefined;
@@ -544,29 +554,29 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
     }
     isValidViewDescriptors(viewDescriptors, collector) {
         if (!Array.isArray(viewDescriptors)) {
-            collector.error(( localize(2559, "views must be an array")));
+            collector.error(( localize(2564, "views must be an array")));
             return false;
         }
         for (const descriptor of viewDescriptors) {
             if (typeof descriptor.id !== 'string') {
-                collector.error(( localize(2552, "property `{0}` is mandatory and must be of type `string`", 'id')));
+                collector.error(( localize(2557, "property `{0}` is mandatory and must be of type `string`", 'id')));
                 return false;
             }
             if (typeof descriptor.name !== 'string') {
-                collector.error(( localize(2552, "property `{0}` is mandatory and must be of type `string`", 'name')));
+                collector.error(( localize(2557, "property `{0}` is mandatory and must be of type `string`", 'name')));
                 return false;
             }
             if (descriptor.when && typeof descriptor.when !== 'string') {
-                collector.error(( localize(2560, "property `{0}` can be omitted or must be of type `string`", 'when')));
+                collector.error(( localize(2565, "property `{0}` can be omitted or must be of type `string`", 'when')));
                 return false;
             }
             if (descriptor.icon && typeof descriptor.icon !== 'string') {
-                collector.error(( localize(2560, "property `{0}` can be omitted or must be of type `string`", 'icon')));
+                collector.error(( localize(2565, "property `{0}` can be omitted or must be of type `string`", 'icon')));
                 return false;
             }
             if (descriptor.contextualTitle && typeof descriptor.contextualTitle !== 'string') {
                 collector.error(( localize(
-                    2560,
+                    2565,
                     "property `{0}` can be omitted or must be of type `string`",
                     'contextualTitle'
                 )));
@@ -574,7 +584,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
             }
             if (descriptor.visibility && !this.convertInitialVisibility(descriptor.visibility)) {
                 collector.error(( localize(
-                    2561,
+                    2566,
                     "property `{0}` can be omitted or must be one of {1}",
                     'visibility',
                     ( Object.values(InitialVisibility)).join(', ')
@@ -626,9 +636,9 @@ class ViewContainersDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(2562, "ID")),
-            ( localize(2563, "Title")),
-            ( localize(2564, "Where")),
+            ( localize(2567, "ID")),
+            ( localize(2568, "Title")),
+            ( localize(2569, "Where")),
         ];
         const rows = ( viewContainers
             .sort((a, b) => a.id.localeCompare(b.id))
@@ -667,9 +677,9 @@ class ViewsDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(2565, "ID")),
-            ( localize(2566, "Name")),
-            ( localize(2564, "Where")),
+            ( localize(2570, "ID")),
+            ( localize(2571, "Name")),
+            ( localize(2569, "Where")),
         ];
         const rows = ( views
             .sort((a, b) => a.id.localeCompare(b.id))
@@ -691,7 +701,7 @@ class ViewsDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions$2.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'viewsContainers',
-    label: ( localize(2567, "View Containers")),
+    label: ( localize(2572, "View Containers")),
     access: {
         canToggle: false
     },
@@ -699,7 +709,7 @@ class ViewsDataRenderer extends Disposable {
 });
 ( Registry.as(Extensions$2.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'views',
-    label: ( localize(2568, "Views")),
+    label: ( localize(2573, "Views")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/browser/actions/listCommands.js

@@ -782,12 +782,12 @@ registerAction2(class ToggleStickyScroll extends Action2 {
         super({
             id: 'tree.toggleStickyScroll',
             title: {
-                ...( localize2(2816, "Toggle Tree Sticky Scroll")),
-                mnemonicTitle: ( localize(2817, "&&Toggle Tree Sticky Scroll")),
+                ...( localize2(2821, "Toggle Tree Sticky Scroll")),
+                mnemonicTitle: ( localize(2822, "&&Toggle Tree Sticky Scroll")),
             },
             category: 'View',
             metadata: { description: ( localize(
-                2818,
+                2823,
                 "Toggles Sticky Scroll widget at the top of tree structures such as the File Explorer and Debug variables View."
             )) },
             f1: true

package/vscode/src/vs/workbench/browser/actions/navigationActions.js

@@ -149,7 +149,7 @@ registerAction2(class extends BaseNavigationAction {
     constructor() {
         super({
             id: 'workbench.action.navigateLeft',
-            title: ( localize2(2819, 'Navigate to the View on the Left')),
+            title: ( localize2(2824, 'Navigate to the View on the Left')),
             category: Categories.View,
             f1: true
         }, Direction.Left);
@@ -159,7 +159,7 @@ registerAction2(class extends BaseNavigationAction {
     constructor() {
         super({
             id: 'workbench.action.navigateRight',
-            title: ( localize2(2820, 'Navigate to the View on the Right')),
+            title: ( localize2(2825, 'Navigate to the View on the Right')),
             category: Categories.View,
             f1: true
         }, Direction.Right);
@@ -169,7 +169,7 @@ registerAction2(class extends BaseNavigationAction {
     constructor() {
         super({
             id: 'workbench.action.navigateUp',
-            title: ( localize2(2821, 'Navigate to the View Above')),
+            title: ( localize2(2826, 'Navigate to the View Above')),
             category: Categories.View,
             f1: true
         }, Direction.Up);
@@ -179,7 +179,7 @@ registerAction2(class extends BaseNavigationAction {
     constructor() {
         super({
             id: 'workbench.action.navigateDown',
-            title: ( localize2(2822, 'Navigate to the View Below')),
+            title: ( localize2(2827, 'Navigate to the View Below')),
             category: Categories.View,
             f1: true
         }, Direction.Down);
@@ -264,7 +264,7 @@ registerAction2(class extends BaseFocusAction {
     constructor() {
         super({
             id: 'workbench.action.focusNextPart',
-            title: ( localize2(2823, 'Focus Next Part')),
+            title: ( localize2(2828, 'Focus Next Part')),
             category: Categories.View,
             f1: true,
             keybinding: {
@@ -278,7 +278,7 @@ registerAction2(class extends BaseFocusAction {
     constructor() {
         super({
             id: 'workbench.action.focusPreviousPart',
-            title: ( localize2(2824, 'Focus Previous Part')),
+            title: ( localize2(2829, 'Focus Previous Part')),
             category: Categories.View,
             f1: true,
             keybinding: {