@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js

@@ -3,7 +3,7 @@ import './media/menubarControl.css.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { MenuRegistry, MenuId, SubmenuItemAction, registerAction2, MenuItemAction, Action2 } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
-import { getMenuBarVisibility, hasNativeTitlebar } from '../../../../platform/window/common/window.js';
+import { getMenuBarVisibility, hasNativeTitlebar, TitleBarSetting } from '../../../../platform/window/common/window.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { Separator, toAction, ActionRunner, Action, SubmenuAction } from '../../../../base/common/actions.js';
 import { addDisposableListener, EventType, Dimension } from '../../../../base/browser/dom.js';
@@ -15,8 +15,11 @@ import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.j
 import { isRecentFolder, isRecentWorkspace } from '../../../../platform/workspaces/common/workspaces.js';
 import { IWorkspacesService } from '../../../../platform/workspaces/common/workspaces.service.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
+import { Verbosity } from '../../../../platform/label/common/label.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
+import { StateType } from '../../../../platform/update/common/update.js';
 import { IUpdateService } from '../../../../platform/update/common/update.service.js';
+import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import '../../../../platform/notification/common/notification.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
@@ -29,6 +32,8 @@ import { IAccessibilityService } from '../../../../platform/accessibility/common
 import { isFullscreen, onDidChangeFullscreen } from '../../../../base/browser/browser.js';
 import { IHostService } from '../../../services/host/browser/host.service.js';
 import { BrowserFeatures } from '../../../../base/browser/canIUse.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IsMacNativeContext, IsWebContext } from '../../../../platform/contextkey/common/contextkeys.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
@@ -37,6 +42,7 @@ import { isICommandActionToggleInfo } from '../../../../platform/action/common/a
 import { createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { defaultMenuStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { mainWindow } from '../../../../base/browser/window.js';
+import { ActivityBarPosition } from '../../../services/layout/browser/layoutService.js';
 import Severity$1 from '../../../../base/common/severity.js';
 const _moduleId = "vs/workbench/browser/parts/titlebar/menubarControl";
 MenuRegistry.appendMenuItem(MenuId.MenubarMainMenu, {
@@ -235,13 +241,13 @@ class MenubarControl extends Disposable {
         const remoteAuthority = recent.remoteAuthority;
         if (isRecentFolder(recent)) {
             uri = recent.folderUri;
-            label = recent.label || this.labelService.getWorkspaceLabel(uri, { verbose: 2  });
+            label = recent.label || this.labelService.getWorkspaceLabel(uri, { verbose: Verbosity.LONG });
             commandId = 'openRecentFolder';
             openable = { folderUri: uri };
         }
         else if (isRecentWorkspace(recent)) {
             uri = recent.workspace.configPath;
-            label = recent.label || this.labelService.getWorkspaceLabel(recent.workspace, { verbose: 2  });
+            label = recent.label || this.labelService.getWorkspaceLabel(recent.workspace, { verbose: Verbosity.LONG });
             commandId = 'openRecentWorkspace';
             openable = { workspaceUri: uri };
         }
@@ -266,7 +272,7 @@ class MenubarControl extends Disposable {
         if (isWeb || isMacintosh) {
             return;
         }
-        const hasBeenNotified = this.storageService.getBoolean('menubar/accessibleMenubarNotified', -1 , false);
+        const hasBeenNotified = this.storageService.getBoolean('menubar/accessibleMenubarNotified', StorageScope.APPLICATION, false);
         const usingCustomMenubar = !hasNativeTitlebar(this.configurationService);
         if (hasBeenNotified || usingCustomMenubar || !this.accessibilityService.isScreenReaderOptimized()) {
             return;
@@ -280,11 +286,11 @@ class MenubarControl extends Disposable {
             {
                 label: ( localizeWithPath(_moduleId, 9, "Open Settings")),
                 run: () => {
-                    return this.preferencesService.openUserSettings({ query: "window.titleBarStyle"  });
+                    return this.preferencesService.openUserSettings({ query: TitleBarSetting.TITLE_BAR_STYLE });
                 }
             }
         ]);
-        this.storageService.store('menubar/accessibleMenubarNotified', true, -1 , 0 );
+        this.storageService.store('menubar/accessibleMenubarNotified', true, StorageScope.APPLICATION, StorageTarget.USER);
     }
 }
 let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
@@ -326,8 +332,8 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
                         id: `workbench.actions.menubar.focus`,
                         title: ( localize2WithPath(_moduleId, 10, 'Focus Application Menu')),
                         keybinding: {
-                            primary: 512  | 68 ,
-                            weight: 200 ,
+                            primary: KeyMod$1.Alt | KeyCode.F10,
+                            weight: KeybindingWeight.WorkbenchContrib,
                             when: IsWebContext
                         },
                         f1: true
@@ -342,29 +348,29 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
     getUpdateAction() {
         const state = this.updateService.state;
         switch (state.type) {
-            case "idle" :
+            case StateType.Idle:
                 return (
                      (new Action('update.check', ( localizeWithPath(_moduleId, 11, "Check for &&Updates...")), undefined, true, () => this.updateService.checkForUpdates(true)))
                 );
-            case "checking for updates" :
+            case StateType.CheckingForUpdates:
                 return (
                      (new Action('update.checking', ( localizeWithPath(_moduleId, 12, "Checking for Updates...")), undefined, false))
                 );
-            case "available for download" :
+            case StateType.AvailableForDownload:
                 return (
                      (new Action('update.downloadNow', ( localizeWithPath(_moduleId, 13, "D&&ownload Update")), undefined, true, () => this.updateService.downloadUpdate()))
                 );
-            case "downloading" :
+            case StateType.Downloading:
                 return (
                      (new Action('update.downloading', ( localizeWithPath(_moduleId, 14, "Downloading Update...")), undefined, false))
                 );
-            case "downloaded" :
+            case StateType.Downloaded:
                 return isMacintosh ? null : ( (new Action('update.install', ( localizeWithPath(_moduleId, 15, "Install &&Update...")), undefined, true, () => this.updateService.applyUpdate())));
-            case "updating" :
+            case StateType.Updating:
                 return (
                      (new Action('update.updating', ( localizeWithPath(_moduleId, 16, "Installing Update...")), undefined, false))
                 );
-            case "ready" :
+            case StateType.Ready:
                 return (
                      (new Action('update.restart', ( localizeWithPath(_moduleId, 17, "Restart to &&Update")), undefined, true, () => this.updateService.quitAndInstall()))
                 );
@@ -414,7 +420,7 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
         const currentSidebarLocation = this.configurationService.getValue('workbench.sideBar.location');
         const horizontalDirection = currentSidebarLocation === 'right' ? HorizontalDirection.Left : HorizontalDirection.Right;
         const activityBarLocation = this.configurationService.getValue('workbench.activityBar.location');
-        const verticalDirection = activityBarLocation === "bottom"  ? VerticalDirection.Above : VerticalDirection.Below;
+        const verticalDirection = activityBarLocation === ActivityBarPosition.BOTTOM ? VerticalDirection.Above : VerticalDirection.Below;
         return { horizontal: horizontalDirection, vertical: verticalDirection };
     }
     onDidVisibilityChange(visible) {

package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js

@@ -4,12 +4,14 @@ import { dirname, basename } from '../../../../base/common/resources.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
-import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
+import { Verbosity, EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { IBrowserWorkbenchEnvironmentService } from '../../../services/environment/browser/environmentService.service.js';
+import { WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { isWindows, isMacintosh, isWeb, isNative } from '../../../../base/common/platform.js';
 import { trim } from '../../../../base/common/strings.js';
 import { template } from '../../../../base/common/labels.js';
+import { Verbosity as Verbosity$1 } from '../../../../platform/label/common/label.js';
 import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
@@ -23,6 +25,11 @@ import { IContextKeyService } from '../../../../platform/contextkey/common/conte
 import { getWindowById } from '../../../../base/browser/dom.js';
 var WindowTitle_1;
 const _moduleId = "vs/workbench/browser/parts/titlebar/windowTitle";
+var WindowSettingNames;
+( ((function(WindowSettingNames) {
+    WindowSettingNames["titleSeparator"] = "window.titleSeparator";
+    WindowSettingNames["title"] = "window.title";
+})(WindowSettingNames || (WindowSettingNames = {}))));
 const defaultWindowTitle = (() => {
     if (isMacintosh && isNative) {
         return '${activeEditorShort}${separator}${rootName}${separator}${profileName}';
@@ -46,7 +53,7 @@ let WindowTitle = class WindowTitle extends Disposable {
         if (!activeEditor) {
             return undefined;
         }
-        const fileName = activeEditor.getTitle(0 );
+        const fileName = activeEditor.getTitle(Verbosity.SHORT);
         const dirty = activeEditor?.isDirty() && !activeEditor.isSaving() ? WindowTitle_1.TITLE_DIRTY : '';
         return `${dirty}${fileName}`;
     }
@@ -92,15 +99,15 @@ let WindowTitle = class WindowTitle extends Disposable {
         }));
     }
     onConfigurationChanged(event) {
-        if (event.affectsConfiguration("window.title" )) {
+        if (event.affectsConfiguration(WindowSettingNames.title)) {
             this.updateTitleIncludesFocusedView();
         }
-        if (event.affectsConfiguration("window.title" ) || event.affectsConfiguration("window.titleSeparator" )) {
+        if (event.affectsConfiguration(WindowSettingNames.title) || event.affectsConfiguration(WindowSettingNames.titleSeparator)) {
             this.titleUpdater.schedule();
         }
     }
     updateTitleIncludesFocusedView() {
-        const titleTemplate = this.configurationService.getValue("window.title" );
+        const titleTemplate = this.configurationService.getValue(WindowSettingNames.title);
         this.titleIncludesFocusedView = typeof titleTemplate === 'string' && titleTemplate.includes('${focusedView}');
     }
     onActiveEditorChange() {
@@ -208,7 +215,7 @@ let WindowTitle = class WindowTitle extends Disposable {
             editorFolderResource = undefined;
         }
         let folder = undefined;
-        if (this.contextService.getWorkbenchState() === 2 ) {
+        if (this.contextService.getWorkbenchState() === WorkbenchState.FOLDER) {
             folder = workspace.folders[0];
         }
         else if (editorResource) {
@@ -224,14 +231,14 @@ let WindowTitle = class WindowTitle extends Disposable {
                 remoteName = this.labelService.getHostLabel(virtualWorkspaceLocation.scheme, virtualWorkspaceLocation.authority);
             }
         }
-        const activeEditorShort = editor ? editor.getTitle(0 ) : '';
-        const activeEditorMedium = editor ? editor.getTitle(1 ) : activeEditorShort;
-        const activeEditorLong = editor ? editor.getTitle(2 ) : activeEditorMedium;
+        const activeEditorShort = editor ? editor.getTitle(Verbosity.SHORT) : '';
+        const activeEditorMedium = editor ? editor.getTitle(Verbosity.MEDIUM) : activeEditorShort;
+        const activeEditorLong = editor ? editor.getTitle(Verbosity.LONG) : activeEditorMedium;
         const activeFolderShort = editorFolderResource ? basename(editorFolderResource) : '';
         const activeFolderMedium = editorFolderResource ? this.labelService.getUriLabel(editorFolderResource, { relative: true }) : '';
         const activeFolderLong = editorFolderResource ? this.labelService.getUriLabel(editorFolderResource) : '';
         const rootName = this.labelService.getWorkspaceLabel(workspace);
-        const rootNameShort = this.labelService.getWorkspaceLabel(workspace, { verbose: 0  });
+        const rootNameShort = this.labelService.getWorkspaceLabel(workspace, { verbose: Verbosity$1.SHORT });
         const rootPath = root ? this.labelService.getUriLabel(root) : '';
         const folderName = folder ? folder.name : '';
         const folderPath = folder ? this.labelService.getUriLabel(folder.uri) : '';
@@ -243,11 +250,11 @@ let WindowTitle = class WindowTitle extends Disposable {
         for (const [contextKey, name] of this.variables) {
             variables[name] = this.contextKeyService.getContextKeyValue(contextKey) ?? '';
         }
-        let titleTemplate = this.configurationService.getValue("window.title" );
+        let titleTemplate = this.configurationService.getValue(WindowSettingNames.title);
         if (typeof titleTemplate !== 'string') {
             titleTemplate = defaultWindowTitle;
         }
-        let separator = this.configurationService.getValue("window.titleSeparator" );
+        let separator = this.configurationService.getValue(WindowSettingNames.titleSeparator);
         if (typeof separator !== 'string') {
             separator = defaultWindowTitleSeparator;
         }
@@ -273,8 +280,8 @@ let WindowTitle = class WindowTitle extends Disposable {
         });
     }
     isCustomTitleFormat() {
-        const title = this.configurationService.inspect("window.title" );
-        const titleSeparator = this.configurationService.inspect("window.titleSeparator" );
+        const title = this.configurationService.inspect(WindowSettingNames.title);
+        const titleSeparator = this.configurationService.inspect(WindowSettingNames.titleSeparator);
         return title.value !== title.defaultValue || titleSeparator.value !== titleSeparator.defaultValue;
     }
 };

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

@@ -1,9 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { DataTransfers } from '../../../../base/browser/dnd.js';
-import { append, $, prepend, asCSSUrl, show, hide, trackFocus, clearNode, getTotalHeight, getLargestChildWidth, getActiveElement } from '../../../../base/browser/dom.js';
+import { append, $, prepend, asCSSUrl, show, hide, trackFocus, isHTMLElement, clearNode, getTotalHeight, getLargestChildWidth, getActiveElement } from '../../../../base/browser/dom.js';
 import { renderMarkdownAsPlaintext } from '../../../../base/browser/markdownRenderer.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
+import { TreeDragOverBubble } from '../../../../base/browser/ui/tree/tree.js';
 import { CollapseAllAction } from '../../../../base/browser/ui/tree/treeDefaults.js';
 import { ActionRunner, Separator } from '../../../../base/common/actions.js';
 import { timeout } from '../../../../base/common/async.js';
@@ -59,7 +60,6 @@ import { IActivityService } from '../../../services/activity/common/activity.ser
 import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
 import { WorkbenchHoverDelegate } from '../../../../platform/hover/browser/hover.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
-import { ITreeViewsService } from '../../../services/views/browser/treeViewsService.service.js';
 import { LocalSelectionTransfer, CodeDataTransfers } from '../../../../platform/dnd/browser/dnd.js';
 import { toExternalVSDataTransfer } from '../../../../editor/browser/dnd.js';
 import { TreeItemCheckbox, CheckboxStateHandler } from './checkbox.js';
@@ -768,7 +768,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
         const container = document.createElement('div');
         container.classList.add('rendered-message');
         for (const child of result) {
-            if (child instanceof HTMLElement) {
+            if (isHTMLElement(child)) {
                 container.appendChild(child);
             }
             else {
@@ -1022,7 +1022,7 @@ let TreeRenderer = class TreeRenderer extends Disposable {
     static { TreeRenderer_1 = this; }
     static { this.ITEM_HEIGHT = 22; }
     static { this.TREE_TEMPLATE_ID = 'treeExplorer'; }
-    constructor(treeViewId, menus, labels, actionViewItemProvider, aligner, checkboxStateHandler, manuallyManageCheckboxes, themeService, configurationService, labelService, treeViewsService, contextKeyService, hoverService, instantiationService) {
+    constructor(treeViewId, menus, labels, actionViewItemProvider, aligner, checkboxStateHandler, manuallyManageCheckboxes, themeService, configurationService, labelService, contextKeyService, hoverService, instantiationService) {
         super();
         this.treeViewId = treeViewId;
         this.menus = menus;
@@ -1034,7 +1034,6 @@ let TreeRenderer = class TreeRenderer extends Disposable {
         this.themeService = themeService;
         this.configurationService = configurationService;
         this.labelService = labelService;
-        this.treeViewsService = treeViewsService;
         this.contextKeyService = contextKeyService;
         this.hoverService = hoverService;
         this._onDidChangeCheckboxState = this._register(( (new Emitter())));
@@ -1183,7 +1182,6 @@ let TreeRenderer = class TreeRenderer extends Disposable {
             templateData.actionBar.actionRunner = this._actionRunner;
         }
         this.setAlignment(templateData.container, node);
-        this.treeViewsService.addRenderedTreeItemElement(node.handle, templateData.container);
         const renderedItems = this._renderedElements.get(element.element.handle) ?? [];
         this._renderedElements.set(element.element.handle, [...renderedItems, { original: element, rendered: templateData }]);
     }
@@ -1327,7 +1325,6 @@ let TreeRenderer = class TreeRenderer extends Disposable {
         else if (itemRenders.length > 0) {
             itemRenders.splice(renderedIndex, 1);
         }
-        this.treeViewsService.removeRenderedTreeItemElement(resource.element.handle);
         templateData.checkbox?.dispose();
         templateData.checkbox = undefined;
     }
@@ -1341,10 +1338,9 @@ TreeRenderer = TreeRenderer_1 = ( (__decorate([
     ( (__param(7, IThemeService))),
     ( (__param(8, IConfigurationService))),
     ( (__param(9, ILabelService))),
-    ( (__param(10, ITreeViewsService))),
-    ( (__param(11, IContextKeyService))),
-    ( (__param(12, IHoverService))),
-    ( (__param(13, IInstantiationService)))
+    ( (__param(10, IContextKeyService))),
+    ( (__param(11, IHoverService))),
+    ( (__param(12, IInstantiationService)))
 ], TreeRenderer)));
 class Aligner extends Disposable {
     constructor(themeService) {
@@ -1676,7 +1672,7 @@ let CustomTreeViewDragAndDrop = class CustomTreeViewDragAndDrop {
             }
         })));
         if (dragContainersSupportedType) {
-            return { accept: true, bubble: 0 , autoExpand: true };
+            return { accept: true, bubble: TreeDragOverBubble.Down, autoExpand: true };
         }
         return false;
     }

package/vscode/src/vs/workbench/browser/parts/views/viewFilter.d.ts

@@ -27,6 +27,7 @@ declare class FilterWidget extends Widget {
     readonly onDidChangeFilterText: Event<string>;
     private moreFiltersActionViewItem;
     private isMoreFiltersChecked;
+    private lastWidth?;
     private focusTracker;
     get onDidFocus(): Event<void>;
     get onDidBlur(): Event<void>;
@@ -39,6 +40,7 @@ declare class FilterWidget extends Widget {
     getFilterText(): string;
     getHistory(): string[];
     layout(width: number): void;
+    relayout(): void;
     checkMoreFilters(checked: boolean): void;
     private createInput;
     private createBadge;

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

@@ -1,6 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Delayer } from '../../../../base/common/async.js';
 import { $, append, addStandardDisposableListener, EventType, trackFocus } from '../../../../base/browser/dom.js';
+import { KeyCode } from '../../../../base/common/keyCodes.js';
 import { IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { toDisposable } from '../../../../base/common/lifecycle.js';
 import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
@@ -23,7 +24,7 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
 import { MenuRegistry, MenuId, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
-import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { MenuWorkbenchToolBar, HiddenItemStrategy } from '../../../../platform/actions/browser/toolbar.js';
 import { SubmenuEntryActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { Widget } from '../../../../base/browser/ui/widget.js';
 import { Emitter } from '../../../../base/common/event.js';
@@ -111,6 +112,12 @@ let FilterWidget = class FilterWidget extends Widget {
         this.element.parentElement?.classList.toggle('grow', width > 700);
         this.element.classList.toggle('small', width < 400);
         this.adjustInputBox();
+        this.lastWidth = width;
+    }
+    relayout() {
+        if (this.lastWidth) {
+            this.layout(this.lastWidth);
+        }
     }
     checkMoreFilters(checked) {
         this.isMoreFiltersChecked = checked;
@@ -154,7 +161,7 @@ let FilterWidget = class FilterWidget extends Widget {
     }
     createToolBar(container) {
         return this.instantiationService.createInstance(MenuWorkbenchToolBar, container, viewFilterMenu, {
-            hiddenItemStrategy: -1 ,
+            hiddenItemStrategy: HiddenItemStrategy.NoHide,
             actionViewItemProvider: (action, options) => {
                 if (action instanceof SubmenuItemAction && action.item.submenu.id === viewFilterSubmenu.id) {
                     this.moreFiltersActionViewItem = this.instantiationService.createInstance(MoreFiltersActionViewItem, action, options);
@@ -173,15 +180,15 @@ let FilterWidget = class FilterWidget extends Widget {
         this.filterInputBox.inputElement.style.paddingRight = this.element.classList.contains('small') || this.filterBadge.classList.contains('hidden') ? '25px' : '150px';
     }
     handleKeyboardEvent(event) {
-        if (event.equals(10 )
-            || event.equals(15 )
-            || event.equals(17 )) {
+        if (event.equals(KeyCode.Space)
+            || event.equals(KeyCode.LeftArrow)
+            || event.equals(KeyCode.RightArrow)) {
             event.stopPropagation();
         }
     }
     onInputKeyDown(event, filterInputBox) {
         let handled = false;
-        if (event.equals(2 ) && !this.toolbar.isEmpty()) {
+        if (event.equals(KeyCode.Tab) && !this.toolbar.isEmpty()) {
             this.toolbar.focus();
             handled = true;
         }

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

@@ -16,7 +16,7 @@ import '../../../../platform/theme/common/colors/searchColors.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';
-import { prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
+import { ActionsOrientation, prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
@@ -25,7 +25,7 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.se
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { Pane } from '../../../../base/browser/ui/splitview/paneview.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
-import { ViewContainerLocationToString, defaultViewIcon, Extensions } from '../../../common/views.js';
+import { ViewContainerLocation, ViewContainerLocationToString, defaultViewIcon, Extensions } from '../../../common/views.js';
 import { IViewDescriptorService } from '../../../common/views.service.js';
 import { IViewsService } from '../../../services/views/common/viewsService.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
@@ -37,9 +37,11 @@ import { parseLinkedText } from '../../../../base/common/linkedText.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { Button } from '../../../../base/browser/ui/button/button.js';
 import { Link } from '../../../../platform/opener/browser/link.js';
+import { Orientation } from '../../../../base/browser/ui/sash/sash.js';
 import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
 import { ScopedProgressIndicator, AbstractProgressScope } from '../../../services/progress/browser/progressIndicator.js';
 import { DomScrollableElement } from '../../../../base/browser/ui/scrollbar/scrollableElement.js';
+import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
 import { URI } from '../../../../base/common/uri.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { Codicon } from '../../../../base/common/codicons.js';
@@ -112,7 +114,7 @@ let ViewWelcomeController = class ViewWelcomeController {
         this.element = $('.welcome-view-content', { tabIndex: 0 });
         this.scrollableElement = ( (new DomScrollableElement(
             this.element,
-            { alwaysConsumeMouseWheel: true, horizontal: 2 , vertical: 3 , }
+            { alwaysConsumeMouseWheel: true, horizontal: ScrollbarVisibility.Hidden, vertical: ScrollbarVisibility.Visible, }
         )));
         append(viewWelcomeContainer, this.scrollableElement.getDomNode());
         this.enabledDisposables.add(toDisposable(() => {
@@ -251,7 +253,7 @@ let ViewPane = class ViewPane extends Pane {
         return this._singleViewPaneContainerTitle;
     }
     constructor(options, keybindingService, contextMenuService, configurationService, contextKeyService, viewDescriptorService, instantiationService, openerService, themeService, telemetryService, hoverService, accessibleViewService) {
-        super({ ...options, ...{ orientation: viewDescriptorService.getViewLocationById(options.id) === 1  ? 1  : 0  } });
+        super({ ...options, ...{ orientation: viewDescriptorService.getViewLocationById(options.id) === ViewContainerLocation.Panel ? Orientation.HORIZONTAL : Orientation.VERTICAL } });
         this.keybindingService = keybindingService;
         this.contextMenuService = contextMenuService;
         this.configurationService = configurationService;
@@ -330,7 +332,7 @@ let ViewPane = class ViewPane extends Pane {
         actions.classList.toggle('show-always', this.showActions === ViewPaneShowActions.Always);
         actions.classList.toggle('show-expanded', this.showActions === ViewPaneShowActions.WhenExpanded);
         this.toolbar = this.instantiationService.createInstance(WorkbenchToolBar, actions, {
-            orientation: 0 ,
+            orientation: ActionsOrientation.HORIZONTAL,
             actionViewItemProvider: (action, options) => this.getActionViewItem(action, options),
             ariaLabel: ( localizeWithPath(_moduleId, 2, "{0} actions", this.title)),
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
@@ -530,7 +532,9 @@ let ViewPane = class ViewPane extends Pane {
                 get trapsArrowNavigation() { return true; }
                 render(container) {
                     container.classList.add('viewpane-filter-container');
-                    append(container, that.getFilterWidget().element);
+                    const filter = that.getFilterWidget();
+                    append(container, filter.element);
+                    filter.relayout();
                 }
             });
         }
@@ -620,14 +624,14 @@ FilterViewPane = ( (__decorate([
 function getLocationBasedViewColors(location) {
     let background, stickyScrollBackground, stickyScrollBorder, stickyScrollShadow;
     switch (location) {
-        case 1 :
+        case ViewContainerLocation.Panel:
             background = PANEL_BACKGROUND;
             stickyScrollBackground = PANEL_STICKY_SCROLL_BACKGROUND;
             stickyScrollBorder = PANEL_STICKY_SCROLL_BORDER;
             stickyScrollShadow = PANEL_STICKY_SCROLL_SHADOW;
             break;
-        case 0 :
-        case 2 :
+        case ViewContainerLocation.Sidebar:
+        case ViewContainerLocation.AuxiliaryBar:
         default:
             background = SIDE_BAR_BACKGROUND;
             stickyScrollBackground = SIDE_BAR_STICKY_SCROLL_BACKGROUND;