@codingame/monaco-vscode-api 4.5.2 → 5.0.0

package/vscode/src/vs/workbench/browser/parts/views/viewPane.js

@@ -13,7 +13,6 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-import { SIDE_BAR_BACKGROUND, PANEL_BACKGROUND } from '../../../common/theme.js';
 import { append, $, addDisposableListener, asCssValueWithDefault, createCSSRule, asCSSUrl, after, trackFocus, EventType, Dimension, reset } from '../../../../base/browser/dom.js';
 import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
 import { Action } from '../../../../base/common/actions.js';
@@ -50,8 +49,10 @@ import { FilterWidget } from './viewFilter.js';
 import { BaseActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { defaultProgressBarStyles, defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { setupCustomHover } from '../../../../base/browser/ui/hover/updatableHoverWidget.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.service.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
+import { SIDE_BAR_BACKGROUND, SIDE_BAR_STICKY_SCROLL_BACKGROUND, SIDE_BAR_STICKY_SCROLL_BORDER, SIDE_BAR_STICKY_SCROLL_SHADOW, PANEL_BACKGROUND, PANEL_STICKY_SCROLL_BACKGROUND, PANEL_STICKY_SCROLL_BORDER, PANEL_STICKY_SCROLL_SHADOW } from '../../../common/theme.js';
 var ViewPane_1;
 const _moduleId = "vs/workbench/browser/parts/views/viewPane";
 var ViewPaneShowActions;
@@ -66,7 +67,7 @@ const viewPaneContainerCollapsedIcon = registerIcon('view-pane-container-collaps
 const viewsRegistry = ( (Registry.as(Extensions.ViewsRegistry)));
 let ViewWelcomeController = class ViewWelcomeController {
     get enabled() { return this._enabled; }
-    constructor(container, delegate, instantiationService, openerService, telemetryService, contextKeyService) {
+    constructor(container, delegate, instantiationService, openerService, telemetryService, contextKeyService, lifecycleService) {
         this.container = container;
         this.delegate = delegate;
         this.instantiationService = instantiationService;
@@ -78,8 +79,8 @@ let ViewWelcomeController = class ViewWelcomeController {
         this.disposables = ( (new DisposableStore()));
         this.enabledDisposables = this.disposables.add(( (new DisposableStore())));
         this.renderDisposables = this.disposables.add(( (new DisposableStore())));
-        this.delegate.onDidChangeViewWelcomeState(this.onDidChangeViewWelcomeState, this, this.disposables);
-        this.onDidChangeViewWelcomeState();
+        this.disposables.add(Event.runAndSubscribe(this.delegate.onDidChangeViewWelcomeState, () => this.onDidChangeViewWelcomeState()));
+        this.disposables.add(lifecycleService.onWillShutdown(() => this.dispose()));
     }
     layout(height, width) {
         if (!this._enabled) {
@@ -234,7 +235,8 @@ ViewWelcomeController = ( (__decorate([
     ( (__param(2, IInstantiationService))),
     ( (__param(3, IOpenerService))),
     ( (__param(4, ITelemetryService))),
-    ( (__param(5, IContextKeyService)))
+    ( (__param(5, IContextKeyService))),
+    ( (__param(6, ILifecycleService)))
 ], ViewWelcomeController)));
 let ViewPane = class ViewPane extends Pane {
     static { ViewPane_1 = this; }
@@ -248,7 +250,7 @@ let ViewPane = class ViewPane extends Pane {
     get singleViewPaneContainerTitle() {
         return this._singleViewPaneContainerTitle;
     }
-    constructor(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService) {
+    constructor(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, accessibleViewService) {
         super({ ...options, ...{ orientation: viewDescriptorService.getViewLocationById(options.id) === 1  ? 1  : 0  } });
         this.keybindingService = keybindingService;
         this.contextMenuService = contextMenuService;
@@ -259,6 +261,8 @@ let ViewPane = class ViewPane extends Pane {
         this.openerService = openerService;
         this.themeService = themeService;
         this.telemetryService = telemetryService;
+        this.hoverService = hoverService;
+        this.accessibleViewService = accessibleViewService;
         this._onDidFocus = this._register(( (new Emitter())));
         this.onDidFocus = this._onDidFocus.event;
         this._onDidBlur = this._register(( (new Emitter())));
@@ -401,12 +405,20 @@ let ViewPane = class ViewPane extends Pane {
         }
         const calculatedTitle = this.calculateTitle(title);
         this.titleContainer = append(container, $('h3.title', {}, calculatedTitle));
-        this.titleContainerHover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.titleContainer, calculatedTitle));
+        this.titleContainerHover = this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.titleContainer, calculatedTitle));
         if (this._titleDescription) {
             this.setTitleDescription(this._titleDescription);
         }
-        this.iconContainerHover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.iconContainer, calculatedTitle));
-        this.iconContainer.setAttribute('aria-label', calculatedTitle);
+        this.iconContainerHover = this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.iconContainer, calculatedTitle));
+        this.iconContainer.setAttribute('aria-label', this._getAriaLabel(calculatedTitle));
+    }
+    _getAriaLabel(title) {
+        const viewHasAccessibilityHelpContent = this.viewDescriptorService.getViewDescriptorById(this.id)?.accessibilityHelpContent;
+        const accessibleViewHasShownForView = this.accessibleViewService?.hasShownAccessibleView(this.id);
+        if (!viewHasAccessibilityHelpContent || accessibleViewHasShownForView) {
+            return title;
+        }
+        return ( localizeWithPath(_moduleId, 3, 'Use Alt+F1 for accessibility help {0}', title));
     }
     updateTitle(title) {
         const calculatedTitle = this.calculateTitle(title);
@@ -416,7 +428,7 @@ let ViewPane = class ViewPane extends Pane {
         }
         if (this.iconContainer) {
             this.iconContainerHover?.update(calculatedTitle);
-            this.iconContainer.setAttribute('aria-label', calculatedTitle);
+            this.iconContainer.setAttribute('aria-label', this._getAriaLabel(calculatedTitle));
         }
         this._title = title;
         this._onDidChangeTitleArea.fire();
@@ -428,7 +440,7 @@ let ViewPane = class ViewPane extends Pane {
         }
         else if (description && this.titleContainer) {
             this.titleDescriptionContainer = after(this.titleContainer, $('span.description', {}, description));
-            this.titleDescriptionContainerHover = this._register(setupCustomHover(getDefaultHoverDelegate('mouse'), this.titleDescriptionContainer, description));
+            this.titleDescriptionContainerHover = this._register(this.hoverService.setupUpdatableHover(getDefaultHoverDelegate('mouse'), this.titleDescriptionContainer, description));
         }
     }
     updateTitleDescription(description) {
@@ -447,14 +459,7 @@ let ViewPane = class ViewPane extends Pane {
         return title;
     }
     renderBody(container) {
-        this.viewWelcomeController = this._register(( (new ViewWelcomeController(
-            container,
-            this,
-            this.instantiationService,
-            this.openerService,
-            this.telemetryService,
-            this.contextKeyService
-        ))));
+        this.viewWelcomeController = this._register(this.instantiationService.createInstance(ViewWelcomeController, container, this));
     }
     layoutBody(height, width) {
         this.viewWelcomeController.layout(height, width);
@@ -483,15 +488,8 @@ let ViewPane = class ViewPane extends Pane {
     getProgressLocation() {
         return this.viewDescriptorService.getViewContainerByViewId(this.id).id;
     }
-    getBackgroundColor() {
-        switch (this.viewDescriptorService.getViewLocationById(this.id)) {
-            case 1 :
-                return PANEL_BACKGROUND;
-            case 0 :
-            case 2 :
-                return SIDE_BAR_BACKGROUND;
-        }
-        return SIDE_BAR_BACKGROUND;
+    getLocationBasedColors() {
+        return getLocationBasedViewColors(this.viewDescriptorService.getViewLocationById(this.id));
     }
     focus() {
         if (this.viewWelcomeController.enabled) {
@@ -568,11 +566,12 @@ ViewPane = ViewPane_1 = ( (__decorate([
     ( (__param(6, IInstantiationService))),
     ( (__param(7, IOpenerService))),
     ( (__param(8, IThemeService))),
-    ( (__param(9, ITelemetryService)))
+    ( (__param(9, ITelemetryService))),
+    ( (__param(10, IHoverService)))
 ], ViewPane)));
 let FilterViewPane = class FilterViewPane extends ViewPane {
-    constructor(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService) {
-        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService);
+    constructor(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, accessibleViewService) {
+        super(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, accessibleViewService);
         this.filterWidget = this._register(instantiationService.createChild(( (new ServiceCollection([IContextKeyService, this.scopedContextKeyService])))).createInstance(FilterWidget, options.filterOptions));
     }
     getFilterWidget() {
@@ -615,8 +614,36 @@ FilterViewPane = ( (__decorate([
     ( (__param(6, IInstantiationService))),
     ( (__param(7, IOpenerService))),
     ( (__param(8, IThemeService))),
-    ( (__param(9, ITelemetryService)))
+    ( (__param(9, ITelemetryService))),
+    ( (__param(10, IHoverService)))
 ], FilterViewPane)));
+function getLocationBasedViewColors(location) {
+    let background, stickyScrollBackground, stickyScrollBorder, stickyScrollShadow;
+    switch (location) {
+        case 1 :
+            background = PANEL_BACKGROUND;
+            stickyScrollBackground = PANEL_STICKY_SCROLL_BACKGROUND;
+            stickyScrollBorder = PANEL_STICKY_SCROLL_BORDER;
+            stickyScrollShadow = PANEL_STICKY_SCROLL_SHADOW;
+            break;
+        case 0 :
+        case 2 :
+        default:
+            background = SIDE_BAR_BACKGROUND;
+            stickyScrollBackground = SIDE_BAR_STICKY_SCROLL_BACKGROUND;
+            stickyScrollBorder = SIDE_BAR_STICKY_SCROLL_BORDER;
+            stickyScrollShadow = SIDE_BAR_STICKY_SCROLL_SHADOW;
+    }
+    return {
+        background,
+        listOverrideStyles: {
+            listBackground: background,
+            treeStickyScrollBackground: stickyScrollBackground,
+            treeStickyScrollBorder: stickyScrollBorder,
+            treeStickyScrollShadow: stickyScrollShadow
+        }
+    };
+}
 class ViewAction extends Action2 {
     constructor(desc) {
         super(desc);
@@ -629,4 +656,4 @@ class ViewAction extends Action2 {
         }
     }
 }
-export { FilterViewPane, VIEWPANE_FILTER_ACTION, ViewAction, ViewPane, ViewPaneShowActions };
+export { FilterViewPane, VIEWPANE_FILTER_ACTION, ViewAction, ViewPane, ViewPaneShowActions, getLocationBasedViewColors };

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

@@ -156,7 +156,7 @@ const registry = ( (Registry.as(Extensions$1.Configuration)));
                         ( localizeWithPath(
                             _moduleId,
                             19,
-                            "`${dirname(N)}`: name of the nth parent folder in which the file is located (e.g. `N=1: root/folder/file.txt -> root`)."
+                            "`${dirname(N)}`: name of the nth parent folder in which the file is located (e.g. `N=1: root/folder/file.txt -> root`). Folders can be picked from the start of the path by using negative numbers (e.g. `N=-1: root/folder/file.txt -> root`). If the __Item__ is an absolute pattern path, the first folder (`N=-1`) refers to the first folder in the absoulte path, otherwise it corresponds to the workspace folder."
                         )),
                         ( localizeWithPath(
                             _moduleId,
@@ -923,28 +923,28 @@ const registry = ( (Registry.as(Extensions$1.Configuration)));
                 'markdownDescription': ( localizeWithPath(
                     _moduleId,
                     119,
-                    "Controls the location of the Activity Bar. It can either show to the `default` or `top` / `bottom` of the Primary and Secondary Side Bar or `hidden`."
+                    "Controls the location of the Activity Bar relative to the Primary and Secondary Side Bars."
                 )),
                 'enumDescriptions': [
                     ( localizeWithPath(
                         _moduleId,
                         120,
-                        "Show the Activity Bar of the Primary Side Bar on the side."
+                        "Show the Activity Bar on the side of the Primary Side Bar and on top of the Secondary Side Bar."
                     )),
                     ( localizeWithPath(
                         _moduleId,
                         121,
-                        "Show the Activity Bar on top of the Primary and Secondary Side Bar."
+                        "Show the Activity Bar on top of the Primary and Secondary Side Bars."
                     )),
                     ( localizeWithPath(
                         _moduleId,
                         122,
-                        "Show the Activity Bar at the bottom of the Primary and Secondary Side Bar."
+                        "Show the Activity Bar at the bottom of the Primary and Secondary Side Bars."
                     )),
                     ( localizeWithPath(
                         _moduleId,
                         123,
-                        "Hide the Activity Bar in the Primary and Secondary Side Bar."
+                        "Hide the Activity Bar in the Primary and Secondary Side Bars."
                     ))
                 ],
             },
@@ -952,18 +952,24 @@ const registry = ( (Registry.as(Extensions$1.Configuration)));
                 'type': 'string',
                 'enum': ['toggle', 'focus'],
                 'default': 'toggle',
-                'description': ( localizeWithPath(
+                'markdownDescription': ( localizeWithPath(
                     _moduleId,
                     124,
-                    "Controls the behavior of clicking an activity bar icon in the workbench."
+                    "Controls the behavior of clicking an Activity Bar icon in the workbench. This value is ignored when {0} is not set to {1}.",
+                    '`#workbench.activityBar.location#`',
+                    '`default`'
                 )),
                 'enumDescriptions': [
                     ( localizeWithPath(
                         _moduleId,
                         125,
-                        "Hide the side bar if the clicked item is already visible."
+                        "Hide the Primary Side Bar if the clicked item is already visible."
                     )),
-                    ( localizeWithPath(_moduleId, 126, "Focus side bar if the clicked item is already visible."))
+                    ( localizeWithPath(
+                        _moduleId,
+                        126,
+                        "Focus the Primary Side Bar if the clicked item is already visible."
+                    ))
                 ]
             },
             'workbench.view.alwaysShowHeaderActions': {