@codingame/monaco-vscode-view-common-service-override 4.5.2 → 5.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-common-service-override",
-  "version": "4.5.2",
+  "version": "5.0.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.5.2",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "4.5.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@5.0.1",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "5.0.1"
   }
 }

package/viewCommon.js

@@ -33,10 +33,8 @@ import { BrowserAuxiliaryWindowService } from './vscode/src/vs/workbench/service
 import { IAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service';
 import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { ViewsService } from 'vscode/vscode/vs/workbench/services/views/browser/viewsService';
-import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 import { IEditorPaneService } from 'vscode/vscode/vs/workbench/services/editor/common/editorPaneService.service';
 import { EditorPaneService } from './vscode/src/vs/workbench/services/editor/browser/editorPaneService.js';
-import { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService/hoverService';
 import { CustomEditorLabelService } from 'vscode/vscode/vs/workbench/services/editor/common/customEditorLabelService';
 import { ICustomEditorLabelService } from 'vscode/vscode/vs/workbench/services/editor/common/customEditorLabelService.service';
 import getServiceOverride$1 from '@codingame/monaco-vscode-bulk-edit-service-override';
@@ -58,9 +56,9 @@ import 'vscode/vscode/vs/workbench/contrib/webview/browser/webview.contribution'
 import './vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.js';
 import './vscode/src/vs/workbench/contrib/sash/browser/sash.contribution.js';
 import './vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js';
-import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.autosave.contribution';
-import 'vscode/vscode/vs/workbench/contrib/files/browser/files.editorPane.contribution';
-import 'vscode/vscode/vs/workbench/contrib/files/browser/fileCommands.save';
+import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.contribution._autosave';
+import 'vscode/vscode/vs/workbench/contrib/files/browser/files.contribution._editorPane';
+import 'vscode/vscode/vs/workbench/contrib/files/browser/fileCommands._save';
 import './vscode/src/vs/workbench/browser/actions/navigationActions.js';
 import './vscode/src/vs/workbench/browser/style.js';
 import './tools/editorAssets.js';
@@ -83,7 +81,6 @@ function getServiceOverride(_webviewIframeAlternateDomains) {
         [( IViewDescriptorService.toString())]: new SyncDescriptor(ViewDescriptorService, [], true),
         [( IActivityService.toString())]: new SyncDescriptor(ActivityService, [], true),
         [( IPaneCompositePartService.toString())]: new SyncDescriptor(PaneCompositePartService, [], true),
-        [( IHoverService.toString())]: new SyncDescriptor(HoverService, [], true),
         [( ICodeEditorService.toString())]: new SyncDescriptor(CodeEditorService, [], true),
         [( ITextEditorService.toString())]: new SyncDescriptor(TextEditorService, [], false),
         [( IEditorResolverService.toString())]: new SyncDescriptor(EditorResolverService, [], false),

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

@@ -31,6 +31,7 @@ import { ITreeViewsService } from 'vscode/vscode/vs/workbench/services/views/bro
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { Extensions as Extensions$2 } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 
 const _moduleId = "vs/workbench/api/browser/viewsExtensionPoint";
 const viewsContainerSchema = {
@@ -186,6 +187,14 @@ const viewDescriptor = {
                 18,
                 "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: ( localizeWithPath(
+                _moduleId,
+                19,
+                "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 with a link to configure one."
+            ))
         }
     }
 };
@@ -210,11 +219,11 @@ const remoteViewDescriptor = {
             type: 'string'
         },
         group: {
-            description: ( localizeWithPath(_moduleId, 19, 'Nested group in the viewlet')),
+            description: ( localizeWithPath(_moduleId, 20, 'Nested group in the viewlet')),
             type: 'string'
         },
         remoteName: {
-            description: ( localizeWithPath(_moduleId, 20, 'The name of the remote type associated with this view')),
+            description: ( localizeWithPath(_moduleId, 21, 'The name of the remote type associated with this view')),
             type: ['string', 'array'],
             items: {
                 type: 'string'
@@ -223,13 +232,13 @@ const remoteViewDescriptor = {
     }
 };
 const viewsContribution = {
-    description: ( localizeWithPath(_moduleId, 21, "Contributes views to the editor")),
+    description: ( localizeWithPath(_moduleId, 22, "Contributes views to the editor")),
     type: 'object',
     properties: {
         'explorer': {
             description: ( localizeWithPath(
                 _moduleId,
-                22,
+                23,
                 "Contributes views to Explorer container in the Activity bar"
             )),
             type: 'array',
@@ -237,19 +246,19 @@ const viewsContribution = {
             default: []
         },
         'debug': {
-            description: ( localizeWithPath(_moduleId, 23, "Contributes views to Debug container in the Activity bar")),
+            description: ( localizeWithPath(_moduleId, 24, "Contributes views to Debug container in the Activity bar")),
             type: 'array',
             items: viewDescriptor,
             default: []
         },
         'scm': {
-            description: ( localizeWithPath(_moduleId, 24, "Contributes views to SCM container in the Activity bar")),
+            description: ( localizeWithPath(_moduleId, 25, "Contributes views to SCM container in the Activity bar")),
             type: 'array',
             items: viewDescriptor,
             default: []
         },
         'test': {
-            description: ( localizeWithPath(_moduleId, 25, "Contributes views to Test container in the Activity bar")),
+            description: ( localizeWithPath(_moduleId, 26, "Contributes views to Test container in the Activity bar")),
             type: 'array',
             items: viewDescriptor,
             default: []
@@ -257,7 +266,7 @@ const viewsContribution = {
         'remote': {
             description: ( localizeWithPath(
                 _moduleId,
-                26,
+                27,
                 "Contributes views to Remote container in the Activity bar. To contribute to this container, enableProposedApi needs to be turned on"
             )),
             type: 'array',
@@ -266,7 +275,7 @@ const viewsContribution = {
         }
     },
     additionalProperties: {
-        description: ( localizeWithPath(_moduleId, 27, "Contributes views to contributed views container")),
+        description: ( localizeWithPath(_moduleId, 28, "Contributes views to contributed views container")),
         type: 'array',
         items: viewDescriptor,
         default: []
@@ -391,14 +400,14 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
     }
     isValidViewsContainer(viewsContainersDescriptors, collector) {
         if (!Array.isArray(viewsContainersDescriptors)) {
-            collector.error(( localizeWithPath(_moduleId, 28, "views containers must be an array")));
+            collector.error(( localizeWithPath(_moduleId, 29, "views containers must be an array")));
             return false;
         }
         for (const descriptor of viewsContainersDescriptors) {
             if (typeof descriptor.id !== 'string' && isFalsyOrWhitespace(descriptor.id)) {
                 collector.error(( localizeWithPath(
                     _moduleId,
-                    29,
+                    30,
                     "property `{0}` is mandatory and must be of type `string` with non-empty value. Only alphanumeric characters, '_', and '-' are allowed.",
                     'id'
                 )));
@@ -407,7 +416,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
             if (!(/^[a-z0-9_-]+$/i.test(descriptor.id))) {
                 collector.error(( localizeWithPath(
                     _moduleId,
-                    29,
+                    30,
                     "property `{0}` is mandatory and must be of type `string` with non-empty value. Only alphanumeric characters, '_', and '-' are allowed.",
                     'id'
                 )));
@@ -416,7 +425,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
             if (typeof descriptor.title !== 'string') {
                 collector.error(( localizeWithPath(
                     _moduleId,
-                    30,
+                    31,
                     "property `{0}` is mandatory and must be of type `string`",
                     'title'
                 )));
@@ -425,7 +434,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
             if (typeof descriptor.icon !== 'string') {
                 collector.error(( localizeWithPath(
                     _moduleId,
-                    30,
+                    31,
                     "property `{0}` is mandatory and must be of type `string`",
                     'icon'
                 )));
@@ -434,7 +443,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
             if (isFalsyOrWhitespace(descriptor.title)) {
                 collector.warn(( localizeWithPath(
                     _moduleId,
-                    31,
+                    32,
                     "property `{0}` is mandatory and must be of type `string` with non-empty value",
                     'title'
                 )));
@@ -505,7 +514,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
                 if (key === 'remote' && !isProposedApiEnabled(extension.description, 'contribViewsRemote')) {
                     collector.warn(( localizeWithPath(
                         _moduleId,
-                        32,
+                        33,
                         "View container '{0}' requires 'enabledApiProposals: [\"contribViewsRemote\"]' to be added to 'Remote'.",
                         key
                     )));
@@ -515,7 +524,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
                 if (!viewContainer) {
                     collector.warn(( localizeWithPath(
                         _moduleId,
-                        33,
+                        34,
                         "View container '{0}' does not exist and all views registered to it will be added to 'Explorer'.",
                         key
                     )));
@@ -527,14 +536,14 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
                     if (( (viewIds.has(item.id)))) {
                         collector.error(( localizeWithPath(
                             _moduleId,
-                            34,
+                            35,
                             "Cannot register multiple views with same id `{0}`",
                             item.id
                         )));
                         continue;
                     }
                     if (this.viewsRegistry.getView(item.id) !== null) {
-                        collector.error(( localizeWithPath(_moduleId, 35, "A view with id `{0}` is already registered.", item.id)));
+                        collector.error(( localizeWithPath(_moduleId, 36, "A view with id `{0}` is already registered.", item.id)));
                         continue;
                     }
                     const order = ExtensionIdentifier.equals(extension.description.identifier, container.extensionId)
@@ -549,7 +558,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
                     const initialVisibility = this.convertInitialVisibility(item.visibility);
                     const type = this.getViewType(item.type);
                     if (!type) {
-                        collector.error(( localizeWithPath(_moduleId, 36, "Unknown view type `{0}`.", item.type)));
+                        collector.error(( localizeWithPath(_moduleId, 37, "Unknown view type `{0}`.", item.type)));
                         continue;
                     }
                     let weight = undefined;
@@ -561,6 +570,10 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
                             this.logService.warn(`${extension.description.identifier.value} tried to set the view size of ${item.id} but it was ignored because the view container does not belong to it.`);
                         }
                     }
+                    let accessibilityHelpContent;
+                    if (isProposedApiEnabled(extension.description, 'contribAccessibilityHelpContent') && item.accessibilityHelpContent) {
+                        accessibilityHelpContent = ( (new MarkdownString(item.accessibilityHelpContent)));
+                    }
                     const viewDescriptor = {
                         type: type,
                         ctorDescriptor: type === ViewType.Tree ? ( (new SyncDescriptor(TreeViewPane))) : ( (new SyncDescriptor(WebviewViewPane))),
@@ -581,7 +594,8 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
                         virtualWorkspace: item.virtualWorkspace,
                         hideByDefault: initialVisibility === InitialVisibility.Hidden,
                         workspace: viewContainer?.id === VIEWLET_ID ? true : undefined,
-                        weight
+                        weight,
+                        accessibilityHelpContent
                     };
                     viewIds.add(viewDescriptor.id);
                     viewDescriptors.push(viewDescriptor);
@@ -626,14 +640,14 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
     }
     isValidViewDescriptors(viewDescriptors, collector) {
         if (!Array.isArray(viewDescriptors)) {
-            collector.error(( localizeWithPath(_moduleId, 37, "views must be an array")));
+            collector.error(( localizeWithPath(_moduleId, 38, "views must be an array")));
             return false;
         }
         for (const descriptor of viewDescriptors) {
             if (typeof descriptor.id !== 'string') {
                 collector.error(( localizeWithPath(
                     _moduleId,
-                    30,
+                    31,
                     "property `{0}` is mandatory and must be of type `string`",
                     'id'
                 )));
@@ -642,7 +656,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
             if (typeof descriptor.name !== 'string') {
                 collector.error(( localizeWithPath(
                     _moduleId,
-                    30,
+                    31,
                     "property `{0}` is mandatory and must be of type `string`",
                     'name'
                 )));
@@ -651,7 +665,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
             if (descriptor.when && typeof descriptor.when !== 'string') {
                 collector.error(( localizeWithPath(
                     _moduleId,
-                    38,
+                    39,
                     "property `{0}` can be omitted or must be of type `string`",
                     'when'
                 )));
@@ -660,7 +674,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
             if (descriptor.icon && typeof descriptor.icon !== 'string') {
                 collector.error(( localizeWithPath(
                     _moduleId,
-                    38,
+                    39,
                     "property `{0}` can be omitted or must be of type `string`",
                     'icon'
                 )));
@@ -669,7 +683,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
             if (descriptor.contextualTitle && typeof descriptor.contextualTitle !== 'string') {
                 collector.error(( localizeWithPath(
                     _moduleId,
-                    38,
+                    39,
                     "property `{0}` can be omitted or must be of type `string`",
                     'contextualTitle'
                 )));
@@ -678,7 +692,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
             if (descriptor.visibility && !this.convertInitialVisibility(descriptor.visibility)) {
                 collector.error(( localizeWithPath(
                     _moduleId,
-                    39,
+                    40,
                     "property `{0}` can be omitted or must be one of {1}",
                     'visibility',
                     ( (Object.values(InitialVisibility))).join(', ')
@@ -730,9 +744,9 @@ class ViewContainersDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localizeWithPath(_moduleId, 40, "ID")),
-            ( localizeWithPath(_moduleId, 41, "Title")),
-            ( localizeWithPath(_moduleId, 42, "Where")),
+            ( localizeWithPath(_moduleId, 41, "ID")),
+            ( localizeWithPath(_moduleId, 42, "Title")),
+            ( localizeWithPath(_moduleId, 43, "Where")),
         ];
         const rows = ( (viewContainers
             .sort((a, b) => a.id.localeCompare(b.id))
@@ -771,9 +785,9 @@ class ViewsDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localizeWithPath(_moduleId, 43, "ID")),
-            ( localizeWithPath(_moduleId, 44, "Name")),
-            ( localizeWithPath(_moduleId, 42, "Where")),
+            ( localizeWithPath(_moduleId, 44, "ID")),
+            ( localizeWithPath(_moduleId, 45, "Name")),
+            ( localizeWithPath(_moduleId, 43, "Where")),
         ];
         const rows = ( (views
             .sort((a, b) => a.id.localeCompare(b.id))
@@ -795,7 +809,7 @@ class ViewsDataRenderer extends Disposable {
 }
 ( (Registry.as(Extensions$2.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'viewsContainers',
-    label: ( localizeWithPath(_moduleId, 45, "View Containers")),
+    label: ( localizeWithPath(_moduleId, 46, "View Containers")),
     access: {
         canToggle: false
     },
@@ -803,7 +817,7 @@ class ViewsDataRenderer extends Disposable {
 });
 ( (Registry.as(Extensions$2.ExtensionFeaturesRegistry))).registerExtensionFeature({
     id: 'views',
-    label: ( localizeWithPath(_moduleId, 46, "Views")),
+    label: ( localizeWithPath(_moduleId, 47, "Views")),
     access: {
         canToggle: false
     },

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

@@ -666,7 +666,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.find',
     weight: 200 ,
     when: ( (ContextKeyExpr.and(RawWorkbenchListFocusContextKey, WorkbenchListSupportsFind))),
-    primary: 2048  | 36 ,
+    primary: 2048  | 512  | 36 ,
     secondary: [61 ],
     handler: (accessor) => {
         const widget = accessor.get(IListService).lastFocusedList;
@@ -752,6 +752,11 @@ registerAction2(class ToggleStickyScroll extends Action2 {
                 mnemonicTitle: ( localizeWithPath(_moduleId, 1, "&&Toggle Tree Sticky Scroll")),
             },
             category: 'View',
+            metadata: { description: ( localizeWithPath(
+                _moduleId,
+                2,
+                "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/media/style.css.js

@@ -1,6 +1,6 @@
 import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = "@keyframes fadeIn{0%{opacity:0}to{opacity:1}}.mac .monaco-workbench-part,.mac.monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,sans-serif}.mac:lang(zh-Hans) .monaco-workbench-part,.mac:lang(zh-Hans).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,PingFang SC,Hiragino Sans GB,sans-serif}.mac:lang(zh-Hant) .monaco-workbench-part,.mac:lang(zh-Hant).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,PingFang TC,sans-serif}.mac:lang(ja) .monaco-workbench-part,.mac:lang(ja).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,Hiragino Kaku Gothic Pro,sans-serif}.mac:lang(ko) .monaco-workbench-part,.mac:lang(ko).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,Nanum Gothic,Apple SD Gothic Neo,AppleGothic,sans-serif}.windows .monaco-workbench-part,.windows.monaco-workbench-part{font-family:Segoe WPC,Segoe UI,sans-serif}.windows:lang(zh-Hans) .monaco-workbench-part,.windows:lang(zh-Hans).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Microsoft YaHei,sans-serif}.windows:lang(zh-Hant) .monaco-workbench-part,.windows:lang(zh-Hant).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Microsoft Jhenghei,sans-serif}.windows:lang(ja) .monaco-workbench-part,.windows:lang(ja).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Yu Gothic UI,Meiryo UI,sans-serif}.windows:lang(ko) .monaco-workbench-part,.windows:lang(ko).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Malgun Gothic,Dotom,sans-serif}.linux .monaco-workbench-part,.linux.monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,sans-serif}.linux:lang(zh-Hans) .monaco-workbench-part,.linux:lang(zh-Hans).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans SC,Source Han Sans CN,Source Han Sans,sans-serif}.linux:lang(zh-Hant) .monaco-workbench-part,.linux:lang(zh-Hant).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans TC,Source Han Sans TW,Source Han Sans,sans-serif}.linux:lang(ja) .monaco-workbench-part,.linux:lang(ja).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans J,Source Han Sans JP,Source Han Sans,sans-serif}.linux:lang(ko) .monaco-workbench-part,.linux:lang(ko).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans K,Source Han Sans JR,Source Han Sans,UnDotum,FBaekmuk Gulim,sans-serif}.mac .monaco-workbench-part,.mac.monaco-workbench-part{--monaco-monospace-font:\"SF Mono\",Monaco,Menlo,Courier,monospace}.windows .monaco-workbench-part,.windows.monaco-workbench-part{--monaco-monospace-font:Consolas,\"Courier New\",monospace}.linux .monaco-workbench-part,.linux.monaco-workbench-part{--monaco-monospace-font:\"Ubuntu Mono\",\"Liberation Mono\",\"DejaVu Sans Mono\",\"Courier New\",monospace}.monaco-workbench-part{color:var(--vscode-foreground);font-size:13px;line-height:1.4em}.monaco-workbench-part.web,.monaco-workbench.web .monaco-workbench-part{touch-action:none}.monaco-workbench.border:not(.fullscreen){border:1px solid var(--window-border-color);box-sizing:border-box}.monaco-workbench.border.mac{border-radius:5px}.monaco-workbench.border.mac.macos-bigsur-or-newer{border-radius:10px}.monaco-workbench-part img{border:0}.monaco-workbench-part label{cursor:pointer}.monaco-workbench-part a{text-decoration:none}.monaco-workbench.hc-black .monaco-workbench-part p>a,.monaco-workbench.hc-black.monaco-workbench-part p>a,.monaco-workbench.hc-light .monaco-workbench-part p>a,.monaco-workbench.hc-light.monaco-workbench-part p>a{text-decoration:underline!important}.monaco-workbench-part a:active{background-color:inherit;color:inherit}.monaco-workbench-part a.plain,.monaco-workbench-part a.plain.hover,.monaco-workbench-part a.plain:hover{color:inherit;text-decoration:none}.monaco-workbench-part input{color:inherit;font-family:inherit;font-size:100%}.monaco-workbench-part table{color:inherit;font-size:inherit}.monaco-workbench-part input::placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part input::-webkit-input-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part input::-moz-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::-webkit-input-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::-moz-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part .pointer{cursor:pointer}.monaco-workbench.mac.monaco-font-aliasing-antialiased .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-antialiased.monaco-workbench-part{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.monaco-workbench.mac.monaco-font-aliasing-none .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-none.monaco-workbench-part{-webkit-font-smoothing:none;-moz-osx-font-smoothing:unset}@media (-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){.monaco-workbench.mac.monaco-font-aliasing-auto .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-auto.monaco-workbench-part{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}}.monaco-workbench-part .context-view{-webkit-app-region:no-drag}.monaco-workbench-part .codicon{color:var(--vscode-icon-foreground)}.monaco-workbench-part .codicon[class*=codicon-]{font-size:16px}.monaco-workbench-part .predefined-file-icon[class*=codicon-]:before{font-family:codicon;padding-left:3px;padding-right:3px;width:16px}.monaco-workbench:not(.file-icons-enabled) .predefined-file-icon[class*=codicon-]:before{content:unset!important}.monaco-workbench.modal-dialog-visible .monaco-progress-container.infinite .progress-bit{display:none}.monaco-workbench-part select{appearance:none;-webkit-appearance:none;-moz-appearance:none;border:1px solid;font-family:inherit}.monaco-workbench-part .select-container{position:relative}.monaco-workbench-part .select-container:after{bottom:0;content:\"\\eab4\";font-family:codicon;font-size:16px;height:16px;line-height:16px;margin:auto;pointer-events:none;position:absolute;right:6px;top:0;width:16px}.monaco-workbench-part .synthetic-focus,.monaco-workbench-part [tabindex=\"-1\"]:focus,.monaco-workbench-part [tabindex=\"0\"]:focus,.monaco-workbench-part button:focus,.monaco-workbench-part input[type=button]:focus,.monaco-workbench-part input[type=checkbox]:focus,.monaco-workbench-part input[type=search]:focus,.monaco-workbench-part input[type=text]:focus,.monaco-workbench-part select:focus,.monaco-workbench-part textarea:focus{opacity:1;outline-color:var(--vscode-focusBorder);outline-offset:-1px;outline-style:solid;outline-width:1px}.monaco-workbench.hc-black .synthetic-focus input,.monaco-workbench.hc-light .synthetic-focus input{background:transparent}.monaco-workbench-part input[type=checkbox]:focus{outline-offset:2px}.monaco-workbench-part [tabindex=\"-1\"]:active,.monaco-workbench-part [tabindex=\"0\"]:active,.monaco-workbench-part input[type=button]:active,.monaco-workbench-part input[type=checkbox]:active,.monaco-workbench-part select:active{outline:0!important}.monaco-workbench.mac .monaco-workbench-part select:focus,.monaco-workbench.mac.monaco-workbench-part select:focus{border-color:transparent}.monaco-workbench .monaco-list:not(.element-focused):focus:before{content:\"\";height:100%;left:0;outline:1px solid;outline-color:var(--vscode-focusBorder);outline-offset:-1px;outline-style:solid;outline-width:1px;pointer-events:none;position:absolute;top:0;width:100%;z-index:15}.monaco-workbench .monaco-list .monaco-list-row .monaco-highlighted-label .highlight{color:var(--vscode-list-highlightForeground)}.monaco-workbench .monaco-list .monaco-list-row.focused .monaco-highlighted-label .highlight{color:var(--vscode-list-focusHighlightForeground)}.monaco-workbench-part .monaco-inputbox.error input[type=text]:focus,.monaco-workbench-part .monaco-inputbox.error.synthetic-focus,.monaco-workbench-part .monaco-inputbox.info input[type=text]:focus,.monaco-workbench-part .monaco-inputbox.info.synthetic-focus,.monaco-workbench-part .monaco-inputbox.warning input[type=text]:focus,.monaco-workbench-part .monaco-inputbox.warning.synthetic-focus,.monaco-workbench-part .monaco-list:focus,.monaco-workbench-part .synthetic-focus :focus{outline:0!important}.monaco-workbench-part a.monaco-link:hover{text-decoration:underline}.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-label:not(.disabled):hover,.monaco-workbench-part .monaco-action-bar:not(.vertical) .monaco-dropdown-with-primary:not(.disabled):hover{background-color:var(--vscode-toolbar-hoverBackground)}.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-item.active .action-label:not(.disabled),.monaco-workbench-part .monaco-action-bar:not(.vertical) .monaco-dropdown.active .action-label:not(.disabled){background-color:var(--vscode-toolbar-activeBackground)}.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-item .action-label:hover:not(.disabled){outline:1px dashed var(--vscode-toolbar-hoverOutline);outline-offset:-1px}";
+var css = "@keyframes fadeIn{0%{opacity:0}to{opacity:1}}.mac .monaco-workbench-part,.mac.monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,sans-serif}.mac:lang(zh-Hans) .monaco-workbench-part,.mac:lang(zh-Hans).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,PingFang SC,Hiragino Sans GB,sans-serif}.mac:lang(zh-Hant) .monaco-workbench-part,.mac:lang(zh-Hant).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,PingFang TC,sans-serif}.mac:lang(ja) .monaco-workbench-part,.mac:lang(ja).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,Hiragino Kaku Gothic Pro,sans-serif}.mac:lang(ko) .monaco-workbench-part,.mac:lang(ko).monaco-workbench-part{font-family:-apple-system,BlinkMacSystemFont,Nanum Gothic,Apple SD Gothic Neo,AppleGothic,sans-serif}.windows .monaco-workbench-part,.windows.monaco-workbench-part{font-family:Segoe WPC,Segoe UI,sans-serif}.windows:lang(zh-Hans) .monaco-workbench-part,.windows:lang(zh-Hans).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Microsoft YaHei,sans-serif}.windows:lang(zh-Hant) .monaco-workbench-part,.windows:lang(zh-Hant).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Microsoft Jhenghei,sans-serif}.windows:lang(ja) .monaco-workbench-part,.windows:lang(ja).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Yu Gothic UI,Meiryo UI,sans-serif}.windows:lang(ko) .monaco-workbench-part,.windows:lang(ko).monaco-workbench-part{font-family:Segoe WPC,Segoe UI,Malgun Gothic,Dotom,sans-serif}.linux .monaco-workbench-part,.linux.monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,sans-serif}.linux:lang(zh-Hans) .monaco-workbench-part,.linux:lang(zh-Hans).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans SC,Source Han Sans CN,Source Han Sans,sans-serif}.linux:lang(zh-Hant) .monaco-workbench-part,.linux:lang(zh-Hant).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans TC,Source Han Sans TW,Source Han Sans,sans-serif}.linux:lang(ja) .monaco-workbench-part,.linux:lang(ja).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans J,Source Han Sans JP,Source Han Sans,sans-serif}.linux:lang(ko) .monaco-workbench-part,.linux:lang(ko).monaco-workbench-part{font-family:system-ui,Ubuntu,Droid Sans,Source Han Sans K,Source Han Sans JR,Source Han Sans,UnDotum,FBaekmuk Gulim,sans-serif}.mac .monaco-workbench-part,.mac.monaco-workbench-part{--monaco-monospace-font:\"SF Mono\",Monaco,Menlo,Courier,monospace}.windows .monaco-workbench-part,.windows.monaco-workbench-part{--monaco-monospace-font:Consolas,\"Courier New\",monospace}.linux .monaco-workbench-part,.linux.monaco-workbench-part{--monaco-monospace-font:\"Ubuntu Mono\",\"Liberation Mono\",\"DejaVu Sans Mono\",\"Courier New\",monospace}.monaco-workbench-part{color:var(--vscode-foreground);font-size:13px;line-height:1.4em}.monaco-workbench-part.web,.monaco-workbench.web .monaco-workbench-part{touch-action:none}.monaco-workbench.border:not(.fullscreen){border:1px solid var(--window-border-color);box-sizing:border-box}.monaco-workbench.border.mac{border-radius:5px}.monaco-workbench.border.mac.macos-bigsur-or-newer{border-radius:10px}.monaco-workbench-part img{border:0}.monaco-workbench-part label{cursor:pointer}.monaco-workbench-part a{text-decoration:none}.monaco-workbench.hc-black .monaco-workbench-part p>a,.monaco-workbench.hc-black.monaco-workbench-part p>a,.monaco-workbench.hc-light .monaco-workbench-part p>a,.monaco-workbench.hc-light.monaco-workbench-part p>a{text-decoration:underline!important}.monaco-workbench-part a:active{background-color:inherit;color:inherit}.monaco-workbench-part a.plain,.monaco-workbench-part a.plain.hover,.monaco-workbench-part a.plain:hover{color:inherit;text-decoration:none}.monaco-workbench-part input{color:inherit;font-family:inherit;font-size:100%}.monaco-workbench-part table{color:inherit;font-size:inherit}.monaco-workbench-part input::placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part input::-webkit-input-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part input::-moz-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::-webkit-input-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part textarea::-moz-placeholder{color:var(--vscode-input-placeholderForeground)}.monaco-workbench-part .pointer{cursor:pointer}.monaco-workbench.mac.monaco-font-aliasing-antialiased .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-antialiased.monaco-workbench-part{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.monaco-workbench.mac.monaco-font-aliasing-none .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-none.monaco-workbench-part{-webkit-font-smoothing:none;-moz-osx-font-smoothing:unset}@media (-webkit-min-device-pixel-ratio:2),(min-resolution:192dpi){.monaco-workbench.mac.monaco-font-aliasing-auto .monaco-workbench-part,.monaco-workbench.mac.monaco-font-aliasing-auto.monaco-workbench-part{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}}.monaco-workbench-part .context-view{-webkit-app-region:no-drag}.monaco-workbench-part .codicon{color:var(--vscode-icon-foreground)}.monaco-workbench-part .codicon[class*=codicon-]{font-size:16px}.monaco-workbench-part .predefined-file-icon[class*=codicon-]:before{font-family:codicon;padding-left:3px;padding-right:3px;width:16px}.monaco-workbench:not(.file-icons-enabled) .predefined-file-icon[class*=codicon-]:before{content:unset!important}.monaco-workbench.modal-dialog-visible .monaco-progress-container.infinite .progress-bit{display:none}.monaco-workbench-part select{appearance:none;-webkit-appearance:none;-moz-appearance:none;border:1px solid;font-family:inherit}.monaco-workbench-part .select-container{position:relative}.monaco-workbench-part .select-container:after{bottom:0;content:var(--vscode-icon-chevron-down-content);font-family:var(--vscode-icon-chevron-down-font-family);font-family:codicon;font-size:16px;height:16px;line-height:16px;margin:auto;pointer-events:none;position:absolute;right:6px;top:0;width:16px}.monaco-workbench-part .synthetic-focus,.monaco-workbench-part [tabindex=\"-1\"]:focus,.monaco-workbench-part [tabindex=\"0\"]:focus,.monaco-workbench-part button:focus,.monaco-workbench-part input[type=button]:focus,.monaco-workbench-part input[type=checkbox]:focus,.monaco-workbench-part input[type=search]:focus,.monaco-workbench-part input[type=text]:focus,.monaco-workbench-part select:focus,.monaco-workbench-part textarea:focus{opacity:1;outline-color:var(--vscode-focusBorder);outline-offset:-1px;outline-style:solid;outline-width:1px}.monaco-workbench.hc-black .synthetic-focus input,.monaco-workbench.hc-light .synthetic-focus input{background:transparent}.monaco-workbench-part input[type=checkbox]:focus{outline-offset:2px}.monaco-workbench-part [tabindex=\"-1\"]:active,.monaco-workbench-part [tabindex=\"0\"]:active,.monaco-workbench-part input[type=button]:active,.monaco-workbench-part input[type=checkbox]:active,.monaco-workbench-part select:active{outline:0!important}.monaco-workbench.mac .monaco-workbench-part select:focus,.monaco-workbench.mac.monaco-workbench-part select:focus{border-color:transparent}.monaco-workbench .monaco-list:not(.element-focused):focus:before{content:\"\";height:100%;left:0;outline:1px solid;outline-color:var(--vscode-focusBorder);outline-offset:-1px;outline-style:solid;outline-width:1px;pointer-events:none;position:absolute;top:0;width:100%;z-index:15}.monaco-workbench .monaco-list .monaco-list-row .monaco-highlighted-label .highlight{color:var(--vscode-list-highlightForeground)}.monaco-workbench .monaco-list .monaco-list-row.focused .monaco-highlighted-label .highlight{color:var(--vscode-list-focusHighlightForeground)}.monaco-workbench-part .monaco-inputbox.error input[type=text]:focus,.monaco-workbench-part .monaco-inputbox.error.synthetic-focus,.monaco-workbench-part .monaco-inputbox.info input[type=text]:focus,.monaco-workbench-part .monaco-inputbox.info.synthetic-focus,.monaco-workbench-part .monaco-inputbox.warning input[type=text]:focus,.monaco-workbench-part .monaco-inputbox.warning.synthetic-focus,.monaco-workbench-part .monaco-list:focus,.monaco-workbench-part .synthetic-focus :focus{outline:0!important}.monaco-workbench-part a.monaco-link:hover{text-decoration:underline}.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-label:not(.disabled):hover,.monaco-workbench-part .monaco-action-bar:not(.vertical) .monaco-dropdown-with-primary:not(.disabled):hover{background-color:var(--vscode-toolbar-hoverBackground)}.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-item.active .action-label:not(.disabled),.monaco-workbench-part .monaco-action-bar:not(.vertical) .monaco-dropdown.active .action-label:not(.disabled){background-color:var(--vscode-toolbar-activeBackground)}.monaco-workbench-part .monaco-action-bar:not(.vertical) .action-item .action-label:hover:not(.disabled){outline:1px dashed var(--vscode-toolbar-hoverOutline);outline-offset:-1px}";
 n(css,{});
 
 export { css, css as default };

package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.js

@@ -39,6 +39,7 @@ import { $ } from 'vscode/vscode/vs/base/browser/dom';
 import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { ActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
 import { CompositeMenuActions } from 'vscode/vscode/vs/workbench/browser/actions';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
 
 var AuxiliaryBarPart_1;
 const _moduleId = "vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart";
@@ -62,11 +63,11 @@ let AuxiliaryBarPart = class AuxiliaryBarPart extends AbstractPaneCompositePart
         }
         return Math.max(width, 300);
     }
-    constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, commandService, menuService, configurationService) {
+    constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, commandService, menuService, configurationService) {
         super("workbench.parts.auxiliarybar" , {
             hasTitle: true,
             borderWidth: () => (this.getColor(SIDE_BAR_BORDER) || this.getColor(contrastBorder)) ? 1 : 0,
-        }, AuxiliaryBarPart_1.activePanelSettingsKey, ActiveAuxiliaryContext.bindTo(contextKeyService), AuxiliaryBarFocusContext.bindTo(contextKeyService), 'auxiliarybar', 'auxiliarybar', undefined, notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
+        }, AuxiliaryBarPart_1.activePanelSettingsKey, ActiveAuxiliaryContext.bindTo(contextKeyService), AuxiliaryBarFocusContext.bindTo(contextKeyService), 'auxiliarybar', 'auxiliarybar', undefined, notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, viewDescriptorService, contextKeyService, extensionService, menuService);
         this.commandService = commandService;
         this.configurationService = configurationService;
         this.minimumWidth = 170;
@@ -201,14 +202,15 @@ AuxiliaryBarPart = AuxiliaryBarPart_1 = ( (__decorate([
     ( (__param(2, IContextMenuService))),
     ( (__param(3, IWorkbenchLayoutService))),
     ( (__param(4, IKeybindingService))),
-    ( (__param(5, IInstantiationService))),
-    ( (__param(6, IThemeService))),
-    ( (__param(7, IViewDescriptorService))),
-    ( (__param(8, IContextKeyService))),
-    ( (__param(9, IExtensionService))),
-    ( (__param(10, ICommandService))),
-    ( (__param(11, IMenuService))),
-    ( (__param(12, IConfigurationService)))
+    ( (__param(5, IHoverService))),
+    ( (__param(6, IInstantiationService))),
+    ( (__param(7, IThemeService))),
+    ( (__param(8, IViewDescriptorService))),
+    ( (__param(9, IContextKeyService))),
+    ( (__param(10, IExtensionService))),
+    ( (__param(11, ICommandService))),
+    ( (__param(12, IMenuService))),
+    ( (__param(13, IConfigurationService)))
 ], AuxiliaryBarPart)));
 
 export { AuxiliaryBarPart };

package/vscode/src/vs/workbench/browser/parts/auxiliarybar/media/auxiliaryBarPart.css.js

@@ -1,6 +1,6 @@
 import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
 
-var css = ".monaco-workbench.noauxiliarybar .part.auxiliarybar{display:none!important;visibility:hidden!important}.monaco-workbench .part.auxiliarybar>.content .monaco-editor,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .margin,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .monaco-editor-background{background-color:var(--vscode-sideBar-background)}.monaco-workbench .part.auxiliarybar .title-actions .actions-container{justify-content:flex-end}.monaco-workbench .part.auxiliarybar .title-actions .action-item{margin-right:4px}.monaco-workbench .part.auxiliarybar>.title>.title-label{flex:1}.monaco-workbench .part.auxiliarybar>.title>.title-label h2{text-transform:uppercase}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container{flex:1}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:0!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;outline-offset:2px}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before{left:6px;position:absolute}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-panelTitle-activeBorder)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-activityBarTop-activeBorder)!important}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-sideBarTitle-foreground)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-activityBarTop-foreground)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) solid 1px!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) dashed 1px!important}.monaco-workbench .auxiliarybar.part.pane-composite-part>.composite.title>.title-actions{flex:inherit}.monaco-workbench .auxiliarybar.pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{max-width:150px}";
+var css = ".monaco-workbench.noauxiliarybar .part.auxiliarybar{display:none!important;visibility:hidden!important}.monaco-workbench .part.auxiliarybar>.content .monaco-editor,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .margin,.monaco-workbench .part.auxiliarybar>.content .monaco-editor .monaco-editor-background{background-color:var(--vscode-sideBar-background)}.monaco-workbench .part.auxiliarybar .title-actions .actions-container{justify-content:flex-end}.monaco-workbench .part.auxiliarybar .title-actions .action-item{margin-right:4px}.monaco-workbench .part.auxiliarybar>.title{background-color:var(--vscode-sideBarTitle-background)}.monaco-workbench .part.auxiliarybar>.title>.title-label{flex:1}.monaco-workbench .part.auxiliarybar>.title>.title-label h2{text-transform:uppercase}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container{flex:1}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus{outline:0!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label{border-radius:0;outline-offset:2px}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item .action-label:before{left:6px;position:absolute}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-panelTitle-activeBorder)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked.clicked:focus .active-item-indicator:before,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked:not(:focus) .active-item-indicator:before{border-top-color:var(--vscode-activityBarTop-activeBorder)!important}.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-sideBarTitle-foreground)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:focus .action-label,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{color:var(--vscode-activityBarTop-foreground)!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item.checked .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) solid 1px!important}.monaco-workbench .part.auxiliarybar>.header-or-footer>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label,.monaco-workbench .part.auxiliarybar>.title>.composite-bar-container>.composite-bar>.monaco-action-bar .action-item:not(.checked):hover .action-label{outline:var(--vscode-contrastActiveBorder,unset) dashed 1px!important}.monaco-workbench .auxiliarybar.part.pane-composite-part>.composite.title>.title-actions{flex:inherit}.monaco-workbench .auxiliarybar.pane-composite-part>.title.has-composite-bar>.title-actions .monaco-action-bar .action-item{max-width:150px}";
 n(css,{});
 
 export { css, css as default };

package/vscode/src/vs/workbench/browser/parts/compositePart.js

@@ -16,16 +16,16 @@ import { ScopedProgressIndicator, AbstractProgressScope } from 'vscode/vscode/vs
 import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
 import { defaultProgressBarStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { createInstantHoverDelegate, getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
-import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 
 const _moduleId = "vs/workbench/browser/parts/compositePart";
 class CompositePart extends Part {
-    constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, instantiationService, themeService, registry, activeCompositeSettingsKey, defaultCompositeId, nameForTelemetry, compositeCSSClass, titleForegroundColor, id, options) {
+    constructor(notificationService, storageService, contextMenuService, layoutService, keybindingService, hoverService, instantiationService, themeService, registry, activeCompositeSettingsKey, defaultCompositeId, nameForTelemetry, compositeCSSClass, titleForegroundColor, id, options) {
         super(id, options, themeService, storageService, layoutService);
         this.notificationService = notificationService;
         this.storageService = storageService;
         this.contextMenuService = contextMenuService;
         this.keybindingService = keybindingService;
+        this.hoverService = hoverService;
         this.instantiationService = instantiationService;
         this.registry = registry;
         this.activeCompositeSettingsKey = activeCompositeSettingsKey;
@@ -244,7 +244,7 @@ class CompositePart extends Part {
         const titleContainer = append(parent, $('.title-label'));
         const titleLabel = append(titleContainer, $('h2'));
         this.titleLabelElement = titleLabel;
-        const hover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), titleLabel, ''));
+        const hover = this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), titleLabel, ''));
         const $this = this;
         return {
             updateTitle: (id, title, keybinding) => {

package/vscode/src/vs/workbench/browser/parts/editor/auxiliaryEditorPart.js

@@ -207,17 +207,19 @@ let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
         return;
     }
     close() {
-        this.doClose(true );
+        return this.doClose(true );
     }
     doClose(mergeGroupsToMainPart) {
+        let result = true;
         if (mergeGroupsToMainPart) {
-            this.mergeGroupsToMainPart();
+            result = this.mergeGroupsToMainPart();
         }
         this._onWillClose.fire();
+        return result;
     }
     mergeGroupsToMainPart() {
         if (!( this.groups.some(group => group.count > 0))) {
-            return;
+            return true;
         }
         let targetGroup = undefined;
         for (const group of this.editorPartsView.mainPart.getGroups(1 )) {
@@ -229,8 +231,9 @@ let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
         if (!targetGroup) {
             targetGroup = this.editorPartsView.mainPart.addGroup(this.editorPartsView.mainPart.activeGroup, this.partOptions.openSideBySideDirection === 'right' ? 3  : 1 );
         }
-        this.mergeAllGroups(targetGroup);
+        const result = this.mergeAllGroups(targetGroup);
         targetGroup.focus();
+        return result;
     }
 };
 AuxiliaryEditorPartImpl = AuxiliaryEditorPartImpl_1 = ( __decorate([

package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js

@@ -34,7 +34,7 @@ import { UntitledTextEditorInputSerializer, UntitledTextEditorWorkingCopyEditorH
 import { DynamicEditorConfigurations } from './editorConfiguration.js';
 import { ShowMultipleEditorTabsAction, ShowSingleEditorTabAction, HideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingleEditorTabAction, ZenHideEditorTabsAction, EditorActionsDefaultAction, EditorActionsTitleBarAction, HideEditorActionsAction } from 'vscode/vscode/vs/workbench/browser/actions/layoutActions';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
-import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.autosave.contribution';
+import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.contribution._autosave';
 
 const _moduleId = "vs/workbench/browser/parts/editor/editor.contribution";
 ( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(TextResourceEditor, TextResourceEditor.ID, ( localizeWithPath(_moduleId, 0, "Text Editor"))), [