@codingame/monaco-vscode-api 5.3.0 → 6.0.1

package/vscode/src/vs/base/browser/ui/list/listView.js

@@ -1,6 +1,6 @@
 import { __decorate } from '../../../../../../../external/tslib/tslib.es6.js';
 import { DataTransfers } from '../../dnd.js';
-import { getContentWidth, scheduleAtNextAnimationFrame, getWindow, addDisposableListener, getContentHeight, $, getTopLeftOffset, animate, isAncestor } from '../../dom.js';
+import { getContentWidth, scheduleAtNextAnimationFrame, getWindow, addDisposableListener, getContentHeight, $, getTopLeftOffset, animate, isHTMLElement, isAncestor } from '../../dom.js';
 import { DomEmitter } from '../../event.js';
 import { Gesture, EventType } from '../../touch.js';
 import { SmoothScrollableElement } from '../scrollbar/scrollableElement.js';
@@ -10,7 +10,8 @@ import { memoize } from '../../../common/decorators.js';
 import { Emitter, Event } from '../../../common/event.js';
 import { Disposable, DisposableStore, toDisposable } from '../../../common/lifecycle.js';
 import { Range } from '../../../common/range.js';
-import { Scrollable } from '../../../common/scrollable.js';
+import { Scrollable, ScrollbarVisibility } from '../../../common/scrollable.js';
+import { ListDragOverEffectType, ListDragOverEffectPosition } from './list.js';
 import { RangeMap, shift } from './rangeMap.js';
 import { RowCache } from './rowCache.js';
 import { BugIndicatingError } from '../../../common/errors.js';
@@ -18,9 +19,16 @@ import { clamp } from '../../../common/numbers.js';
 const StaticDND = {
     CurrentDragAndDropData: undefined
 };
+var ListViewTargetSector;
+( (function(ListViewTargetSector) {
+    ListViewTargetSector[ListViewTargetSector["TOP"] = 0] = "TOP";
+    ListViewTargetSector[ListViewTargetSector["CENTER_TOP"] = 1] = "CENTER_TOP";
+    ListViewTargetSector[ListViewTargetSector["CENTER_BOTTOM"] = 2] = "CENTER_BOTTOM";
+    ListViewTargetSector[ListViewTargetSector["BOTTOM"] = 3] = "BOTTOM";
+})(ListViewTargetSector || (ListViewTargetSector = {})));
 const DefaultOptions = {
     useShadows: true,
-    verticalScrollMode: 1 ,
+    verticalScrollMode: ScrollbarVisibility.Auto,
     setRowLineHeight: true,
     setRowHeight: true,
     supportDynamicHeights: false,
@@ -209,7 +217,7 @@ class ListView {
         })));
         this.scrollableElement = this.disposables.add(( new SmoothScrollableElement(this.rowsContainer, {
             alwaysConsumeMouseWheel: options.alwaysConsumeMouseWheel ?? DefaultOptions.alwaysConsumeMouseWheel,
-            horizontal: 1 ,
+            horizontal: ScrollbarVisibility.Auto,
             vertical: options.verticalScrollMode ?? DefaultOptions.verticalScrollMode,
             useShadows: options.useShadows ?? DefaultOptions.useShadows,
             mouseWheelScrollSensitivity: options.mouseWheelScrollSensitivity,
@@ -814,7 +822,7 @@ class ListView {
             this.currentDragFeedbackDisposable.dispose();
             return false;
         }
-        event.browserEvent.dataTransfer.dropEffect = ((typeof result !== 'boolean' && result.effect?.type === 0) ) ? 'copy' : 'move';
+        event.browserEvent.dataTransfer.dropEffect = (typeof result !== 'boolean' && result.effect?.type === ListDragOverEffectType.Copy) ? 'copy' : 'move';
         let feedback;
         if (typeof result !== 'boolean' && result.feedback) {
             feedback = result.feedback;
@@ -829,7 +837,7 @@ class ListView {
         }
         feedback = distinct(feedback).filter(i => i >= -1 && i < this.length).sort((a, b) => a - b);
         feedback = feedback[0] === -1 ? [-1] : feedback;
-        let dragOverEffectPosition = typeof result !== 'boolean' && result.effect && result.effect.position ? result.effect.position : "drop-target" ;
+        let dragOverEffectPosition = typeof result !== 'boolean' && result.effect && result.effect.position ? result.effect.position : ListDragOverEffectPosition.Over;
         if (equalsDragFeedback(this.currentDragFeedback, feedback) && this.currentDragFeedbackPosition === dragOverEffectPosition) {
             return true;
         }
@@ -845,13 +853,13 @@ class ListView {
             });
         }
         else {
-            if (feedback.length > 1 && dragOverEffectPosition !== "drop-target" ) {
+            if (feedback.length > 1 && dragOverEffectPosition !== ListDragOverEffectPosition.Over) {
                 throw ( new Error('Can\'t use multiple feedbacks with position different than \'over\''));
             }
-            if (dragOverEffectPosition === "drop-target-after" ) {
+            if (dragOverEffectPosition === ListDragOverEffectPosition.After) {
                 if (feedback[0] < this.length - 1) {
                     feedback[0] += 1;
-                    dragOverEffectPosition = "drop-target-before" ;
+                    dragOverEffectPosition = ListDragOverEffectPosition.Before;
                 }
             }
             for (const index of feedback) {
@@ -953,7 +961,7 @@ class ListView {
     getItemIndexFromEventTarget(target) {
         const scrollableElement = this.scrollableElement.getDomNode();
         let element = target;
-        while (element instanceof HTMLElement && element !== this.rowsContainer && scrollableElement.contains(element)) {
+        while (isHTMLElement(element) && element !== this.rowsContainer && scrollableElement.contains(element)) {
             const rawIndex = element.getAttribute('data-index');
             if (rawIndex) {
                 const index = Number(rawIndex);
@@ -1127,4 +1135,4 @@ ListView.__decorator = ( __decorate([
 ListView.__decorator = ( __decorate([
     memoize
 ], ListView.prototype, "onTap", null));
-export { ElementsDragAndDropData, ExternalElementsDragAndDropData, ListView, NativeDragAndDropData };
+export { ElementsDragAndDropData, ExternalElementsDragAndDropData, ListView, ListViewTargetSector, NativeDragAndDropData };

package/vscode/src/vs/base/browser/ui/list/listWidget.js

@@ -1,5 +1,5 @@
 import { __decorate } from '../../../../../../../external/tslib/tslib.es6.js';
-import { EventHelper, getWindow, createStyleSheet, isActiveElement, getActiveElement, asCssValueWithDefault, isMouseEvent } from '../../dom.js';
+import { EventHelper, getWindow, createStyleSheet, isActiveElement, isHTMLElement, getActiveElement, asCssValueWithDefault, isMouseEvent } from '../../dom.js';
 import { DomEmitter } from '../../event.js';
 import { StandardKeyboardEvent } from '../../keyboardEvent.js';
 import { Gesture } from '../../touch.js';
@@ -11,6 +11,7 @@ import { Color } from '../../../common/color.js';
 import { memoize } from '../../../common/decorators.js';
 import { Event, EventBufferer, Emitter } from '../../../common/event.js';
 import { matchesPrefix, matchesFuzzy2 } from '../../../common/filters.js';
+import { KeyCode } from '../../../common/keyCodes.js';
 import { DisposableStore, dispose } from '../../../common/lifecycle.js';
 import { clamp } from '../../../common/numbers.js';
 import { isMacintosh } from '../../../common/platform.js';
@@ -232,19 +233,19 @@ class KeyboardController {
         this.multipleSelectionSupport = options.multipleSelectionSupport;
         this.disposables.add(this.onKeyDown(e => {
             switch (e.keyCode) {
-                case 3 :
+                case KeyCode.Enter:
                     return this.onEnter(e);
-                case 16 :
+                case KeyCode.UpArrow:
                     return this.onUpArrow(e);
-                case 18 :
+                case KeyCode.DownArrow:
                     return this.onDownArrow(e);
-                case 11 :
+                case KeyCode.PageUp:
                     return this.onPageUpArrow(e);
-                case 12 :
+                case KeyCode.PageDown:
                     return this.onPageDownArrow(e);
-                case 9 :
+                case KeyCode.Escape:
                     return this.onEscape(e);
-                case 31 :
+                case KeyCode.KeyA:
                     if (this.multipleSelectionSupport && (isMacintosh ? e.metaKey : e.ctrlKey)) {
                         this.onCtrlA(e);
                     }
@@ -336,10 +337,10 @@ const DefaultKeyboardNavigationDelegate = new class {
         if (event.ctrlKey || event.metaKey || event.altKey) {
             return false;
         }
-        return ((event.keyCode >= 31  && event.keyCode <= 56) )
-            || ((event.keyCode >= 21  && event.keyCode <= 30) )
-            || ((event.keyCode >= 98  && event.keyCode <= 107) )
-            || ((event.keyCode >= 85  && event.keyCode <= 95) );
+        return (event.keyCode >= KeyCode.KeyA && event.keyCode <= KeyCode.KeyZ)
+            || (event.keyCode >= KeyCode.Digit0 && event.keyCode <= KeyCode.Digit9)
+            || (event.keyCode >= KeyCode.Numpad0 && event.keyCode <= KeyCode.Numpad9)
+            || (event.keyCode >= KeyCode.Semicolon && event.keyCode <= KeyCode.Quote);
     }
 };
 class TypeNavigationController {
@@ -468,7 +469,7 @@ class DOMFocusController {
         const onKeyDown = Event.chain(this.disposables.add(( new DomEmitter(view.domNode, 'keydown'))).event, $ => ( $
             .filter(e => !isInputElement(e.target))
             .map(e => ( new StandardKeyboardEvent(e)))));
-        const onTab = Event.chain(onKeyDown, $ => $.filter(e => e.keyCode === 2  && !e.ctrlKey && !e.metaKey && !e.shiftKey && !e.altKey));
+        const onTab = Event.chain(onKeyDown, $ => $.filter(e => e.keyCode === KeyCode.Tab && !e.ctrlKey && !e.metaKey && !e.shiftKey && !e.altKey));
         onTab(this.onTab, this, this.disposables);
     }
     onTab(e) {
@@ -484,7 +485,7 @@ class DOMFocusController {
             return;
         }
         const tabIndexElement = focusedDomElement.querySelector('[tabIndex]');
-        if (!tabIndexElement || !(tabIndexElement instanceof HTMLElement) || tabIndexElement.tabIndex === -1) {
+        if (!tabIndexElement || !(isHTMLElement(tabIndexElement)) || tabIndexElement.tabIndex === -1) {
             return;
         }
         const style = getWindow(tabIndexElement).getComputedStyle(tabIndexElement);
@@ -1032,12 +1033,12 @@ class List {
     get onContextMenu() {
         let didJustPressContextMenuKey = false;
         const fromKeyDown = Event.chain(this.disposables.add(( new DomEmitter(this.view.domNode, 'keydown'))).event, $ => ( ( $.map(e => ( new StandardKeyboardEvent(e))))
-            .filter(e => didJustPressContextMenuKey = e.keyCode === 58  || ((e.shiftKey && e.keyCode === 68) ))
+            .filter(e => didJustPressContextMenuKey = e.keyCode === KeyCode.ContextMenu || (e.shiftKey && e.keyCode === KeyCode.F10))
             .map(e => EventHelper.stop(e, true)))
             .filter(() => false));
         const fromKeyUp = Event.chain(this.disposables.add(( new DomEmitter(this.view.domNode, 'keyup'))).event, $ => ( ( ( $.forEach(() => didJustPressContextMenuKey = false)
             .map(e => ( new StandardKeyboardEvent(e))))
-            .filter(e => e.keyCode === 58  || ((e.shiftKey && e.keyCode === 68) ))
+            .filter(e => e.keyCode === KeyCode.ContextMenu || (e.shiftKey && e.keyCode === KeyCode.F10))
             .map(e => EventHelper.stop(e, true)))
             .map(({ browserEvent }) => {
             const focus = this.getFocus();

package/vscode/src/vs/base/browser/ui/menu/menu.js

@@ -3,9 +3,9 @@ import { Gesture, EventType as EventType$1 } from '../../touch.js';
 import { addDisposableListener, EventType, EventHelper, isAncestor, getWindow, isInShadowDOM, createStyleSheet, append, $, clearNode, getActiveElement, Dimension } from '../../dom.js';
 import { StandardKeyboardEvent } from '../../keyboardEvent.js';
 import { StandardMouseEvent } from '../../mouseEvent.js';
-import { ActionBar } from '../actionbar/actionbar.js';
+import { ActionBar, ActionsOrientation } from '../actionbar/actionbar.js';
 import { BaseActionViewItem, ActionViewItem } from '../actionbar/actionViewItems.js';
-import { layout } from '../contextview/contextview.js';
+import { layout, LayoutAnchorPosition } from '../contextview/contextview.js';
 import { DomScrollableElement } from '../scrollbar/scrollableElement.js';
 import { Separator, SubmenuAction, EmptySubmenuAction } from '../../../common/actions.js';
 import { RunOnceScheduler } from '../../../common/async.js';
@@ -13,8 +13,10 @@ import { Codicon } from '../../../common/codicons.js';
 import { getCodiconFontCharacters } from '../../../common/codiconsUtil.js';
 import { ThemeIcon } from '../../../common/themables.js';
 import { stripIcons } from '../../../common/iconLabels.js';
+import { KeyCode } from '../../../common/keyCodes.js';
 import { DisposableStore } from '../../../common/lifecycle.js';
 import { isMacintosh, isLinux } from '../../../common/platform.js';
+import { ScrollbarVisibility } from '../../../common/scrollable.js';
 import { escape, ltrim, rtrim } from '../../../common/strings.js';
 const MENU_MNEMONIC_REGEX = /\(&([^\s&])\)|(^|[^&])&([^\s&])/;
 const MENU_ESCAPED_MNEMONIC_REGEX = /(&)?(&)([^\s&])/g;
@@ -36,14 +38,14 @@ class Menu extends ActionBar {
         menuElement.classList.add('monaco-menu');
         menuElement.setAttribute('role', 'presentation');
         super(menuElement, {
-            orientation: 1 ,
+            orientation: ActionsOrientation.VERTICAL,
             actionViewItemProvider: action => this.doGetActionViewItem(action, options, parentData),
             context: options.context,
             actionRunner: options.actionRunner,
             ariaLabel: options.ariaLabel,
             ariaRole: 'menu',
             focusOnlyEnabledItems: true,
-            triggerKeys: { keys: [3 , ...(isMacintosh || isLinux ? [10 ] : [])], keyDown: true }
+            triggerKeys: { keys: [KeyCode.Enter, ...(isMacintosh || isLinux ? [KeyCode.Space] : [])], keyDown: true }
         });
         this.menuStyles = menuStyles;
         this.menuElement = menuElement;
@@ -52,7 +54,7 @@ class Menu extends ActionBar {
         this._register(Gesture.addTarget(menuElement));
         this._register(addDisposableListener(menuElement, EventType.KEY_DOWN, (e) => {
             const event = ( new StandardKeyboardEvent(e));
-            if (event.equals(2 )) {
+            if (event.equals(KeyCode.Tab)) {
                 e.preventDefault();
             }
         }));
@@ -82,12 +84,12 @@ class Menu extends ActionBar {
         if (isLinux) {
             this._register(addDisposableListener(menuElement, EventType.KEY_DOWN, e => {
                 const event = ( new StandardKeyboardEvent(e));
-                if (event.equals(14 ) || event.equals(11 )) {
+                if (event.equals(KeyCode.Home) || event.equals(KeyCode.PageUp)) {
                     this.focusedItem = this.viewItems.length - 1;
                     this.focusNext();
                     EventHelper.stop(e, true);
                 }
-                else if (event.equals(13 ) || event.equals(12 )) {
+                else if (event.equals(KeyCode.End) || event.equals(KeyCode.PageDown)) {
                     this.focusedItem = 0;
                     this.focusPrevious();
                     EventHelper.stop(e, true);
@@ -141,8 +143,8 @@ class Menu extends ActionBar {
         this.mnemonics = ( new Map());
         this.scrollableElement = this._register(( new DomScrollableElement(menuElement, {
             alwaysConsumeMouseWheel: true,
-            horizontal: 2 ,
-            vertical: 3 ,
+            horizontal: ScrollbarVisibility.Hidden,
+            vertical: ScrollbarVisibility.Visible,
             verticalScrollbarSize: 7,
             handleMouseWheel: true,
             useShadows: true
@@ -547,7 +549,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem {
         }
         this._register(addDisposableListener(this.element, EventType.KEY_UP, e => {
             const event = ( new StandardKeyboardEvent(e));
-            if (event.equals(17 ) || event.equals(3 )) {
+            if (event.equals(KeyCode.RightArrow) || event.equals(KeyCode.Enter)) {
                 EventHelper.stop(e, true);
                 this.createSubmenu(true);
             }
@@ -555,7 +557,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem {
         this._register(addDisposableListener(this.element, EventType.KEY_DOWN, e => {
             const event = ( new StandardKeyboardEvent(e));
             if (getActiveElement() === this.item) {
-                if (event.equals(17 ) || event.equals(3 )) {
+                if (event.equals(KeyCode.RightArrow) || event.equals(KeyCode.Enter)) {
                     EventHelper.stop(e, true);
                 }
             }
@@ -608,7 +610,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem {
     }
     calculateSubmenuMenuLayout(windowDimensions, submenu, entry, expandDirection) {
         const ret = { top: 0, left: 0 };
-        ret.left = layout(windowDimensions.width, submenu.width, { position: expandDirection.horizontal === HorizontalDirection.Right ? 0  : 1 , offset: entry.left, size: entry.width });
+        ret.left = layout(windowDimensions.width, submenu.width, { position: expandDirection.horizontal === HorizontalDirection.Right ? LayoutAnchorPosition.Before : LayoutAnchorPosition.After, offset: entry.left, size: entry.width });
         if (ret.left >= entry.left && ret.left < entry.left + entry.width) {
             if (entry.left + 10 + submenu.width <= windowDimensions.width) {
                 ret.left = entry.left + 10;
@@ -616,7 +618,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem {
             entry.top += 10;
             entry.height = 0;
         }
-        ret.top = layout(windowDimensions.height, submenu.height, { position: 0 , offset: entry.top, size: 0 });
+        ret.top = layout(windowDimensions.height, submenu.height, { position: LayoutAnchorPosition.Before, offset: entry.top, size: 0 });
         if (ret.top + submenu.height === entry.top && ret.top + entry.height + submenu.height <= windowDimensions.height) {
             ret.top += entry.height;
         }
@@ -656,7 +658,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem {
             this.submenuContainer.style.top = `${top - viewBox.top}px`;
             this.submenuDisposables.add(addDisposableListener(this.submenuContainer, EventType.KEY_UP, e => {
                 const event = ( new StandardKeyboardEvent(e));
-                if (event.equals(15 )) {
+                if (event.equals(KeyCode.LeftArrow)) {
                     EventHelper.stop(e, true);
                     this.parentData.parent.focus();
                     this.cleanupExistingSubmenu(true);
@@ -664,7 +666,7 @@ class SubmenuMenuActionViewItem extends BaseMenuActionViewItem {
             }));
             this.submenuDisposables.add(addDisposableListener(this.submenuContainer, EventType.KEY_DOWN, e => {
                 const event = ( new StandardKeyboardEvent(e));
-                if (event.equals(15 )) {
+                if (event.equals(KeyCode.LeftArrow)) {
                     EventHelper.stop(e, true);
                 }
             }));

package/vscode/src/vs/base/browser/ui/menu/menubar.js

@@ -10,7 +10,7 @@ import { RunOnceScheduler } from '../../../common/async.js';
 import { Codicon } from '../../../common/codicons.js';
 import { ThemeIcon } from '../../../common/themables.js';
 import { Emitter } from '../../../common/event.js';
-import { ScanCodeUtils } from '../../../common/keyCodes.js';
+import { ScanCodeUtils, ScanCode, KeyCode, KeyMod as KeyMod$1 } from '../../../common/keyCodes.js';
 import { Disposable, DisposableStore, dispose } from '../../../common/lifecycle.js';
 import { isMacintosh } from '../../../common/platform.js';
 import { escape, ltrim, rtrim } from '../../../common/strings.js';
@@ -62,13 +62,13 @@ class MenuBar extends Disposable {
             let eventHandled = true;
             const key = !!e.key ? e.key.toLocaleLowerCase() : '';
             const tabNav = isMacintosh && !this.isCompact;
-            if (event.equals(15 ) || (tabNav && event.equals(2  | 1024 ))) {
+            if (event.equals(KeyCode.LeftArrow) || (tabNav && event.equals(KeyCode.Tab | KeyMod$1.Shift))) {
                 this.focusPrevious();
             }
-            else if (event.equals(17 ) || (tabNav && event.equals(2 ))) {
+            else if (event.equals(KeyCode.RightArrow) || (tabNav && event.equals(KeyCode.Tab))) {
                 this.focusNext();
             }
-            else if (event.equals(9 ) && this.isFocused && !this.isOpen) {
+            else if (event.equals(KeyCode.Escape) && this.isFocused && !this.isOpen) {
                 this.setUnfocusedState();
             }
             else if (!this.isOpen && !event.ctrlKey && this.options.enableMnemonics && this.mnemonicsInUse && ( (this.mnemonics.has(key)))) {
@@ -78,7 +78,7 @@ class MenuBar extends Disposable {
             else {
                 eventHandled = false;
             }
-            if (!this.isCompact && (event.equals(2  | 1024 ) || event.equals(2 ))) {
+            if (!this.isCompact && (event.equals(KeyCode.Tab | KeyMod$1.Shift) || event.equals(KeyCode.Tab))) {
                 event.preventDefault();
             }
             if (eventHandled) {
@@ -147,7 +147,7 @@ class MenuBar extends Disposable {
                 this._register(addDisposableListener(buttonElement, EventType.KEY_UP, (e) => {
                     const event = ( (new StandardKeyboardEvent(e)));
                     let eventHandled = true;
-                    if ((event.equals(18 ) || event.equals(3 )) && !this.isOpen) {
+                    if ((event.equals(KeyCode.DownArrow) || event.equals(KeyCode.Enter)) && !this.isOpen) {
                         this.focusedMenu = { index: menuIndex };
                         this.openedViaKeyboard = true;
                         this.focusState = MenubarState.OPEN;
@@ -229,17 +229,17 @@ class MenuBar extends Disposable {
         this._register(addDisposableListener(buttonElement, EventType.KEY_UP, (e) => {
             const event = ( (new StandardKeyboardEvent(e)));
             let eventHandled = true;
-            const triggerKeys = [3 ];
+            const triggerKeys = [KeyCode.Enter];
             if (!this.isCompact) {
-                triggerKeys.push(18 );
+                triggerKeys.push(KeyCode.DownArrow);
             }
             else {
-                triggerKeys.push(10 );
+                triggerKeys.push(KeyCode.Space);
                 if (this.options.compactMode?.horizontal === HorizontalDirection.Right) {
-                    triggerKeys.push(17 );
+                    triggerKeys.push(KeyCode.RightArrow);
                 }
                 else if (this.options.compactMode?.horizontal === HorizontalDirection.Left) {
-                    triggerKeys.push(15 );
+                    triggerKeys.push(KeyCode.LeftArrow);
                 }
             }
             if ((( (triggerKeys.some(k => event.equals(k)))) && !this.isOpen)) {
@@ -733,7 +733,7 @@ class MenuBar extends Disposable {
             return;
         }
         if (modifierKeyStatus.event && this.shouldAltKeyFocus) {
-            if (ScanCodeUtils.toEnum(modifierKeyStatus.event.code) === 159 ) {
+            if (ScanCodeUtils.toEnum(modifierKeyStatus.event.code) === ScanCode.AltLeft) {
                 modifierKeyStatus.event.preventDefault();
             }
         }
@@ -798,8 +798,8 @@ class MenuBar extends Disposable {
             menuHolder.style.left = `${titleBoundingRect.left + this.container.clientWidth}px`;
         }
         else if (this.options.compactMode?.horizontal === HorizontalDirection.Left) {
-            menuHolder.style.top = `${titleBoundingRect.top}px`;
-            menuHolder.style.right = `${this.container.clientWidth}px`;
+            const windowWidth = getWindow(this.container).innerWidth;
+            menuHolder.style.right = `${windowWidth - titleBoundingRect.left}px`;
             menuHolder.style.left = 'auto';
         }
         else {

package/vscode/src/vs/base/browser/ui/resizable/resizable.js

@@ -1,5 +1,5 @@
 import { Dimension } from '../../dom.js';
-import { Sash, OrthogonalEdge } from '../sash/sash.js';
+import { Sash, Orientation, OrthogonalEdge, SashState } from '../sash/sash.js';
 import { Emitter, Event } from '../../../common/event.js';
 import { DisposableStore } from '../../../common/lifecycle.js';
 class ResizableHTMLElement {
@@ -16,22 +16,22 @@ class ResizableHTMLElement {
         this._eastSash = ( new Sash(
             this.domNode,
             { getVerticalSashLeft: () => this._size.width },
-            { orientation: 0  }
+            { orientation: Orientation.VERTICAL }
         ));
         this._westSash = ( new Sash(
             this.domNode,
             { getVerticalSashLeft: () => 0 },
-            { orientation: 0  }
+            { orientation: Orientation.VERTICAL }
         ));
         this._northSash = ( new Sash(
             this.domNode,
             { getHorizontalSashTop: () => 0 },
-            { orientation: 1 , orthogonalEdge: OrthogonalEdge.North }
+            { orientation: Orientation.HORIZONTAL, orthogonalEdge: OrthogonalEdge.North }
         ));
         this._southSash = ( new Sash(
             this.domNode,
             { getHorizontalSashTop: () => this._size.height },
-            { orientation: 1 , orthogonalEdge: OrthogonalEdge.South }
+            { orientation: Orientation.HORIZONTAL, orthogonalEdge: OrthogonalEdge.South }
         ));
         this._northSash.orthogonalStartSash = this._westSash;
         this._northSash.orthogonalEndSash = this._eastSash;
@@ -108,10 +108,10 @@ class ResizableHTMLElement {
         this.domNode.remove();
     }
     enableSashes(north, east, south, west) {
-        this._northSash.state = north ? 3  : 0 ;
-        this._eastSash.state = east ? 3  : 0 ;
-        this._southSash.state = south ? 3  : 0 ;
-        this._westSash.state = west ? 3  : 0 ;
+        this._northSash.state = north ? SashState.Enabled : SashState.Disabled;
+        this._eastSash.state = east ? SashState.Enabled : SashState.Disabled;
+        this._southSash.state = south ? SashState.Enabled : SashState.Disabled;
+        this._westSash.state = west ? SashState.Enabled : SashState.Disabled;
     }
     layout(height = this.size.height, width = this.size.width) {
         const { height: minHeight, width: minWidth } = this._minSize;

package/vscode/src/vs/base/browser/ui/sash/sash.js

@@ -1,5 +1,5 @@
 import { __decorate } from '../../../../../../../external/tslib/tslib.es6.js';
-import { append, $, EventHelper, createStyleSheet, getWindow } from '../../dom.js';
+import { append, $, EventHelper, createStyleSheet, isHTMLElement, getWindow } from '../../dom.js';
 import { DomEmitter } from '../../event.js';
 import { Gesture, EventType } from '../../touch.js';
 import { Delayer } from '../../../common/async.js';
@@ -16,6 +16,18 @@ var OrthogonalEdge;
     OrthogonalEdge["East"] = "east";
     OrthogonalEdge["West"] = "west";
 })(OrthogonalEdge || (OrthogonalEdge = {})));
+var Orientation;
+( (function(Orientation) {
+    Orientation[Orientation["VERTICAL"] = 0] = "VERTICAL";
+    Orientation[Orientation["HORIZONTAL"] = 1] = "HORIZONTAL";
+})(Orientation || (Orientation = {})));
+var SashState;
+( (function(SashState) {
+    SashState[SashState["Disabled"] = 0] = "Disabled";
+    SashState[SashState["AtMinimum"] = 1] = "AtMinimum";
+    SashState[SashState["AtMaximum"] = 2] = "AtMaximum";
+    SashState[SashState["Enabled"] = 3] = "Enabled";
+})(SashState || (SashState = {})));
 let globalSize = 4;
 const onDidChangeGlobalSize = ( new Emitter());
 function setGlobalSashSize(size) {
@@ -98,9 +110,9 @@ class Sash extends Disposable {
         if (this._state === state) {
             return;
         }
-        this.el.classList.toggle('disabled', state === 0 );
-        this.el.classList.toggle('minimum', state === 1 );
-        this.el.classList.toggle('maximum', state === 2 );
+        this.el.classList.toggle('disabled', state === SashState.Disabled);
+        this.el.classList.toggle('minimum', state === SashState.AtMinimum);
+        this.el.classList.toggle('maximum', state === SashState.AtMaximum);
         this._state = state;
         this.onDidEnablementChange.fire(state);
     }
@@ -113,7 +125,7 @@ class Sash extends Disposable {
         if (sash) {
             const onChange = (state) => {
                 this.orthogonalStartDragHandleDisposables.clear();
-                if (state !== 0 ) {
+                if (state !== SashState.Disabled) {
                     this._orthogonalStartDragHandle = append(this.el, $('.orthogonal-drag-handle.start'));
                     this.orthogonalStartDragHandleDisposables.add(toDisposable(() => this._orthogonalStartDragHandle.remove()));
                     this.orthogonalStartDragHandleDisposables.add(( new DomEmitter(this._orthogonalStartDragHandle, 'mouseenter'))).event(() => Sash.onMouseEnter(sash), undefined, this.orthogonalStartDragHandleDisposables);
@@ -134,7 +146,7 @@ class Sash extends Disposable {
         if (sash) {
             const onChange = (state) => {
                 this.orthogonalEndDragHandleDisposables.clear();
-                if (state !== 0 ) {
+                if (state !== SashState.Disabled) {
                     this._orthogonalEndDragHandle = append(this.el, $('.orthogonal-drag-handle.end'));
                     this.orthogonalEndDragHandleDisposables.add(toDisposable(() => this._orthogonalEndDragHandle.remove()));
                     this.orthogonalEndDragHandleDisposables.add(( new DomEmitter(this._orthogonalEndDragHandle, 'mouseenter'))).event(() => Sash.onMouseEnter(sash), undefined, this.orthogonalEndDragHandleDisposables);
@@ -150,7 +162,7 @@ class Sash extends Disposable {
         super();
         this.hoverDelay = globalHoverDelay;
         this.hoverDelayer = this._register(( new Delayer(this.hoverDelay)));
-        this._state = 3 ;
+        this._state = SashState.Enabled;
         this.onDidEnablementChange = this._register(( new Emitter()));
         this._onDidStart = this._register(( new Emitter()));
         this._onDidChange = this._register(( new Emitter()));
@@ -197,7 +209,7 @@ class Sash extends Disposable {
         }, this));
         if (typeof options.size === 'number') {
             this.size = options.size;
-            if (options.orientation === 0 ) {
+            if (options.orientation === Orientation.VERTICAL) {
                 this.el.style.width = `${this.size}px`;
             }
             else {
@@ -215,8 +227,8 @@ class Sash extends Disposable {
         this.layoutProvider = layoutProvider;
         this.orthogonalStartSash = options.orthogonalStartSash;
         this.orthogonalEndSash = options.orthogonalEndSash;
-        this.orientation = options.orientation || 0 ;
-        if (this.orientation === 1 ) {
+        this.orientation = options.orientation || Orientation.VERTICAL;
+        if (this.orientation === Orientation.HORIZONTAL) {
             this.el.classList.add('horizontal');
             this.el.classList.remove('vertical');
         }
@@ -261,11 +273,11 @@ class Sash extends Disposable {
             if (isMultisashResize) {
                 cursor = 'all-scroll';
             }
-            else if (this.orientation === 1 ) {
-                if (this.state === 1 ) {
+            else if (this.orientation === Orientation.HORIZONTAL) {
+                if (this.state === SashState.AtMinimum) {
                     cursor = 's-resize';
                 }
-                else if (this.state === 2 ) {
+                else if (this.state === SashState.AtMaximum) {
                     cursor = 'n-resize';
                 }
                 else {
@@ -273,10 +285,10 @@ class Sash extends Disposable {
                 }
             }
             else {
-                if (this.state === 1 ) {
+                if (this.state === SashState.AtMinimum) {
                     cursor = 'e-resize';
                 }
-                else if (this.state === 2 ) {
+                else if (this.state === SashState.AtMaximum) {
                     cursor = 'w-resize';
                 }
                 else {
@@ -342,7 +354,7 @@ class Sash extends Disposable {
         Sash.onMouseLeave(this);
     }
     layout() {
-        if (this.orientation === 0 ) {
+        if (this.orientation === Orientation.VERTICAL) {
             const verticalProvider = this.layoutProvider;
             this.el.style.left = verticalProvider.getVerticalSashLeft(this) - (this.size / 2) + 'px';
             if (verticalProvider.getVerticalSashTop) {
@@ -365,7 +377,7 @@ class Sash extends Disposable {
     }
     getOrthogonalSash(e) {
         const target = e.initialTarget ?? e.target;
-        if (!target || !(target instanceof HTMLElement)) {
+        if (!target || !(isHTMLElement(target))) {
             return undefined;
         }
         if (target.classList.contains('orthogonal-drag-handle')) {
@@ -378,4 +390,4 @@ class Sash extends Disposable {
         this.el.remove();
     }
 }
-export { OrthogonalEdge, Sash, setGlobalHoverDelay, setGlobalSashSize };
+export { Orientation, OrthogonalEdge, Sash, SashState, setGlobalHoverDelay, setGlobalSashSize };

package/vscode/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.js

@@ -3,6 +3,7 @@ import { AbstractScrollbar } from './abstractScrollbar.js';
 import { ARROW_IMG_SIZE } from './scrollbarArrow.js';
 import { ScrollbarState } from './scrollbarState.js';
 import { Codicon } from '../../../common/codicons.js';
+import { ScrollbarVisibility } from '../../../common/scrollable.js';
 class HorizontalScrollbar extends AbstractScrollbar {
     constructor(scrollable, options, host) {
         const scrollDimensions = scrollable.getScrollDimensions();
@@ -12,8 +13,8 @@ class HorizontalScrollbar extends AbstractScrollbar {
             host: host,
             scrollbarState: ( new ScrollbarState(
                 (options.horizontalHasArrows ? options.arrowSize : 0),
-                (options.horizontal === 2  ? 0 : options.horizontalScrollbarSize),
-                (options.vertical === 2  ? 0 : options.verticalScrollbarSize),
+                (options.horizontal === ScrollbarVisibility.Hidden ? 0 : options.horizontalScrollbarSize),
+                (options.vertical === ScrollbarVisibility.Hidden ? 0 : options.verticalScrollbarSize),
                 scrollDimensions.width,
                 scrollDimensions.scrollWidth,
                 scrollPosition.scrollLeft
@@ -83,8 +84,8 @@ class HorizontalScrollbar extends AbstractScrollbar {
         target.scrollLeft = scrollPosition;
     }
     updateOptions(options) {
-        this.updateScrollbarSize(options.horizontal === 2  ? 0 : options.horizontalScrollbarSize);
-        this._scrollbarState.setOppositeScrollbarSize(options.vertical === 2  ? 0 : options.verticalScrollbarSize);
+        this.updateScrollbarSize(options.horizontal === ScrollbarVisibility.Hidden ? 0 : options.horizontalScrollbarSize);
+        this._scrollbarState.setOppositeScrollbarSize(options.vertical === ScrollbarVisibility.Hidden ? 0 : options.verticalScrollbarSize);
         this._visibilityController.setVisibility(options.horizontal);
         this._scrollByPage = options.scrollByPage;
     }

package/vscode/src/vs/base/browser/ui/scrollbar/scrollableElement.js

@@ -9,7 +9,7 @@ import { TimeoutTimer } from '../../../common/async.js';
 import { Emitter } from '../../../common/event.js';
 import { dispose } from '../../../common/lifecycle.js';
 import { isMacintosh } from '../../../common/platform.js';
-import { Scrollable } from '../../../common/scrollable.js';
+import { Scrollable, ScrollbarVisibility } from '../../../common/scrollable.js';
 import './media/scrollbars.css.js';
 const HIDE_TIMEOUT = 500;
 const SCROLL_WHEEL_SENSITIVITY = 50;
@@ -484,11 +484,11 @@ function resolveOptions(opts) {
         mouseWheelSmoothScroll: (typeof opts.mouseWheelSmoothScroll !== 'undefined' ? opts.mouseWheelSmoothScroll : true),
         arrowSize: (typeof opts.arrowSize !== 'undefined' ? opts.arrowSize : 11),
         listenOnDomNode: (typeof opts.listenOnDomNode !== 'undefined' ? opts.listenOnDomNode : null),
-        horizontal: ((typeof opts.horizontal !== 'undefined' ? opts.horizontal : 1) ),
+        horizontal: (typeof opts.horizontal !== 'undefined' ? opts.horizontal : ScrollbarVisibility.Auto),
         horizontalScrollbarSize: (typeof opts.horizontalScrollbarSize !== 'undefined' ? opts.horizontalScrollbarSize : 10),
         horizontalSliderSize: (typeof opts.horizontalSliderSize !== 'undefined' ? opts.horizontalSliderSize : 0),
         horizontalHasArrows: (typeof opts.horizontalHasArrows !== 'undefined' ? opts.horizontalHasArrows : false),
-        vertical: ((typeof opts.vertical !== 'undefined' ? opts.vertical : 1) ),
+        vertical: (typeof opts.vertical !== 'undefined' ? opts.vertical : ScrollbarVisibility.Auto),
         verticalScrollbarSize: (typeof opts.verticalScrollbarSize !== 'undefined' ? opts.verticalScrollbarSize : 10),
         verticalHasArrows: (typeof opts.verticalHasArrows !== 'undefined' ? opts.verticalHasArrows : false),
         verticalSliderSize: (typeof opts.verticalSliderSize !== 'undefined' ? opts.verticalSliderSize : 0),