@codingame/monaco-vscode-views-service-override 2.0.3 → 2.1.0

package/index.d.ts

@@ -3,7 +3,6 @@ export { SidebarPart } from './vscode/src/vs/workbench/browser/parts/sidebar/sid
 export { ActivityService } from 'vscode/vscode/vs/workbench/services/activity/browser/activityService';
 export { ActivitybarPart } from './vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js';
 export { IReference } from 'vscode/vscode/vs/base/common/lifecycle';
-export { HoverService } from 'vscode/vscode/vs/workbench/services/hover/browser/hoverService';
 export { PanelPart } from './vscode/src/vs/workbench/browser/parts/panel/panelPart.js';
 export { GroupOrientation } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 export { EditorInputFactoryObject, RegisteredEditorInfo, RegisteredEditorOptions, RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
@@ -11,6 +10,7 @@ export { IResolvedTextEditorModel } from 'vscode/vscode/vs/editor/common/service
 export { ConfirmResult } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 export { AbstractResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/resourceEditorInput';
 export { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
+export { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService';
 export { EditorInput, IEditorCloseHandler } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 export { EditorInputCapabilities, IEditorSerializer } from 'vscode/vscode/vs/workbench/common/editor';
 export { EditorPane } from './vscode/src/vs/workbench/browser/parts/editor/editorPane.js';

package/index.js

@@ -11,6 +11,6 @@ export { AbstractTextResourceEditorInput } from 'vscode/vscode/vs/workbench/comm
 export { ActivityService } from './vscode/src/vs/workbench/services/activity/browser/activityService.js';
 export { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 export { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
-export { HoverService } from './vscode/src/vs/workbench/services/hover/browser/hoverService.js';
+export { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService';
 export { PanelPart } from './vscode/src/vs/workbench/browser/parts/panel/panelPart.js';
 export { SidebarPart } from './vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-views-service-override",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,16 +18,16 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.0.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.1.0",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "2.0.3",
-    "@codingame/monaco-vscode-layout-service-override": "2.0.3",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.0.3",
-    "@codingame/monaco-vscode-keybindings-service-override": "2.0.3",
-    "@codingame/monaco-vscode-files-service-override": "2.0.3",
-    "@codingame/monaco-vscode-extensions-service-override": "2.0.3",
-    "@codingame/monaco-vscode-environment-service-override": "2.0.3",
-    "@codingame/monaco-vscode-host-service-override": "2.0.3",
-    "@codingame/monaco-vscode-base-service-override": "2.0.3"
+    "@codingame/monaco-vscode-bulk-edit-service-override": "2.1.0",
+    "@codingame/monaco-vscode-layout-service-override": "2.1.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "2.1.0",
+    "@codingame/monaco-vscode-keybindings-service-override": "2.1.0",
+    "@codingame/monaco-vscode-files-service-override": "2.1.0",
+    "@codingame/monaco-vscode-extensions-service-override": "2.1.0",
+    "@codingame/monaco-vscode-environment-service-override": "2.1.0",
+    "@codingame/monaco-vscode-host-service-override": "2.1.0",
+    "@codingame/monaco-vscode-base-service-override": "2.1.0"
   }
 }

package/tools/editor.js

@@ -22,6 +22,7 @@ import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/h
 import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { TextResourceEditorInput } from 'vscode/vscode/vs/workbench/common/editor/textResourceEditorInput';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { unsupported } from '../tools.js';
 
 var StandaloneEditorGroup_1;
@@ -164,6 +165,7 @@ let StandaloneEditorGroup = StandaloneEditorGroup_1 = class StandaloneEditorGrou
         this.editor = editor;
         this.scopedContextKeyService = scopedContextKeyService;
         this.active = false;
+        this.windowId = mainWindow.vscodeWindowId;
         this.onDidFocus = this.editor.onDidFocusEditorWidget;
         this.onDidOpenEditorFail = Event.None;
         this.whenRestored = Promise.resolve();
@@ -434,6 +436,18 @@ let MonacoDelegateEditorGroupsService = class MonacoDelegateEditorGroupsService
             codeEditorService.listCodeEditors().forEach(handleCodeEditor);
         });
     }
+    get isReady() {
+        return this.delegate.isReady;
+    }
+    get whenReady() {
+        return this.delegate.whenReady;
+    }
+    get whenRestored() {
+        return this.delegate.whenRestored;
+    }
+    get hasRestorableState() {
+        return this.delegate.hasRestorableState;
+    }
     get parts() { return this.delegate.parts; }
     createAuxiliaryEditorPart(options) {
         return this.delegate.createAuxiliaryEditorPart(options);

package/views.js

@@ -1,9 +1,8 @@
 import { __decorate, __param } from './external/tslib/tslib.es6.js';
 import { StandaloneServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { IViewDescriptorService, Extensions, IViewsService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService, Extensions } from 'vscode/vscode/vs/workbench/common/views';
 export { ViewContainerLocation } from 'vscode/vscode/vs/workbench/common/views';
-import { ViewsService } from 'vscode/vscode/vs/workbench/browser/parts/views/viewsService';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { SidebarPart } from './vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js';
 import { ViewDescriptorService } from './vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js';
@@ -12,8 +11,6 @@ import { ActivityService } from './vscode/src/vs/workbench/services/activity/bro
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
 export { ActivitybarPart } from './vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js';
 import { MutableDisposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import { IHoverService } from 'vscode/vscode/vs/workbench/services/hover/browser/hover';
-import { HoverService } from './vscode/src/vs/workbench/services/hover/browser/hoverService.js';
 import { ExplorerService } from './vscode/src/vs/workbench/contrib/files/browser/explorerService.js';
 import { IExplorerService } from 'vscode/vscode/vs/workbench/contrib/files/browser/files';
 import { PanelPart } from './vscode/src/vs/workbench/browser/parts/panel/panelPart.js';
@@ -100,6 +97,11 @@ import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/w
 import { PaneCompositePartService } from './vscode/src/vs/workbench/browser/parts/paneCompositePartService.js';
 import { EditorParts } from './vscode/src/vs/workbench/browser/parts/editor/editorParts.js';
 import { IAuxiliaryWindowService, BrowserAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { ViewsService } from 'vscode/vscode/vs/workbench/services/views/browser/viewsService';
+import { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService';
+export { HoverService } from 'vscode/vscode/vs/editor/browser/services/hoverService';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover';
 import { MonacoEditorService, MonacoDelegateEditorGroupsService } from './tools/editor.js';
 import getServiceOverride$2 from '@codingame/monaco-vscode-bulk-edit-service-override';
 import getServiceOverride$1 from '@codingame/monaco-vscode-layout-service-override';
@@ -423,6 +425,11 @@ let MonacoEditorParts = class MonacoEditorParts extends MonacoDelegateEditorGrou
             return this.delegate.restoreGroup(...args);
         };
     }
+    getId() {
+        return 'standalone';
+    }
+    updateStyles() {
+    }
     registerPart(part) {
         return this.delegate.registerPart(part);
     }
@@ -794,4 +801,4 @@ function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains,
     };
 }
 
-export { ActivityService, HoverService, PanelPart, SidebarPart, SimpleEditorInput, SimpleEditorPane, attachPart, getServiceOverride as default, getPanelPosition, getSideBarPosition, isEditorPartVisible, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility };
+export { ActivityService, PanelPart, SidebarPart, SimpleEditorInput, SimpleEditorPane, attachPart, getServiceOverride as default, getPanelPosition, getSideBarPosition, isEditorPartVisible, isPartVisibile, onDidChangePanelPosition, onDidChangeSideBarPosition, onPartVisibilityChange, registerCustomView, registerEditor, registerEditorPane, registerEditorSerializer, renderActivitybarPar, renderAuxiliaryPart, renderEditorPart, renderPanelPart, renderPart, renderSidebarPart, renderStatusBarPart, setPartVisibility };

package/vscode/src/vs/base/common/codicons.d.ts

@@ -58,6 +58,7 @@ declare const Codicon: {
     readonly closeDirty: ThemeIcon;
     readonly debugBreakpoint: ThemeIcon;
     readonly debugBreakpointDisabled: ThemeIcon;
+    readonly debugBreakpointPending: ThemeIcon;
     readonly debugHint: ThemeIcon;
     readonly primitiveSquare: ThemeIcon;
     readonly edit: ThemeIcon;
@@ -551,6 +552,10 @@ declare const Codicon: {
     readonly sparkleFilled: ThemeIcon;
     readonly diffSingle: ThemeIcon;
     readonly diffMultiple: ThemeIcon;
+    readonly surroundWith: ThemeIcon;
+    readonly gitStash: ThemeIcon;
+    readonly gitStashApply: ThemeIcon;
+    readonly gitStashPop: ThemeIcon;
     readonly dialogError: ThemeIcon;
     readonly dialogWarning: ThemeIcon;
     readonly dialogInfo: ThemeIcon;

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

@@ -23,7 +23,7 @@ import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensio
 import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { KeyChord } from 'vscode/vscode/vs/base/common/keyCodes';
 import { IListService, WorkbenchListFocusContextKey } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { IHoverService } from 'vscode/vscode/vs/workbench/services/hover/browser/hover';
+import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover';
 import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { AsyncDataTree } from 'vscode/vscode/vs/base/browser/ui/tree/asyncDataTree';
 import { ITreeViewsService } from 'vscode/vscode/vs/workbench/services/views/browser/treeViewsService';
@@ -381,7 +381,7 @@ let ViewsExtensionHandler = class ViewsExtensionHandler {
                 if (!treeItem.tooltip) {
                     return;
                 }
-                const element = treeViewsService.getRenderedTreeElement(treeItem);
+                const element = treeViewsService.getRenderedTreeElement(('handle' in treeItem) ? treeItem.handle : treeItem);
                 if (!element) {
                     return;
                 }

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

@@ -1,6 +1,6 @@
 import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { List } from 'vscode/vscode/vs/base/browser/ui/list/listWidget';
-import { WorkbenchListFocusContextKey, IListService, WorkbenchListSupportsMultiSelectContextKey, WorkbenchTreeElementCanCollapse, WorkbenchTreeElementHasParent, getSelectionKeyboardEvent, WorkbenchTreeElementCanExpand, WorkbenchTreeElementHasChild, WorkbenchListHasSelectionOrFocus, WorkbenchListSelectionNavigation, RawWorkbenchListFocusContextKey, WorkbenchListSupportsFind, WorkbenchTreeFindOpen, WorkbenchListScrollAtTopContextKey, WorkbenchListScrollAtBottomContextKey } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { WorkbenchListFocusContextKey, IListService, WorkbenchListSupportsMultiSelectContextKey, WorkbenchTreeElementCanCollapse, WorkbenchTreeElementHasParent, WorkbenchTreeStickyScrollFocused, getSelectionKeyboardEvent, WorkbenchTreeElementCanExpand, WorkbenchTreeElementHasChild, WorkbenchListHasSelectionOrFocus, WorkbenchListSelectionNavigation, RawWorkbenchListFocusContextKey, WorkbenchListSupportsFind, WorkbenchTreeFindOpen, WorkbenchListScrollAtTopContextKey, WorkbenchListScrollAtBottomContextKey } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { PagedList } from 'vscode/vscode/vs/base/browser/ui/list/listPaging';
 import { range, equals } from 'vscode/vscode/vs/base/common/arrays';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -9,8 +9,11 @@ import { AsyncDataTree } from 'vscode/vscode/vs/base/browser/ui/tree/asyncDataTr
 import { DataTree } from 'vscode/vscode/vs/base/browser/ui/tree/dataTree';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { Table } from 'vscode/vscode/vs/base/browser/ui/table/tableWidget';
-import { AbstractTree, TreeFindMode } from 'vscode/vscode/vs/base/browser/ui/tree/abstractTree';
+import { AbstractTree, TreeFindMode, TreeFindMatchType } from 'vscode/vscode/vs/base/browser/ui/tree/abstractTree';
 import { isActiveElement } from 'vscode/vscode/vs/base/browser/dom';
+import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 
 function ensureDOMFocus(widget) {
     const element = widget?.getHTMLElement();
@@ -76,6 +79,38 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         });
     }
 });
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'list.focusAnyDown',
+    weight: 200 ,
+    when: WorkbenchListFocusContextKey,
+    primary: 512  | 18 ,
+    mac: {
+        primary: 512  | 18 ,
+        secondary: [256  | 512  | 44 ]
+    },
+    handler: (accessor, arg2) => {
+        navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
+            const fakeKeyboardEvent = ( new KeyboardEvent('keydown', { altKey: true }));
+            await widget.focusNext(typeof arg2 === 'number' ? arg2 : 1, false, fakeKeyboardEvent);
+        });
+    }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'list.focusAnyUp',
+    weight: 200 ,
+    when: WorkbenchListFocusContextKey,
+    primary: 512  | 16 ,
+    mac: {
+        primary: 512  | 16 ,
+        secondary: [256  | 512  | 46 ]
+    },
+    handler: (accessor, arg2) => {
+        navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
+            const fakeKeyboardEvent = ( new KeyboardEvent('keydown', { altKey: true }));
+            await widget.focusPrevious(typeof arg2 === 'number' ? arg2 : 1, false, fakeKeyboardEvent);
+        });
+    }
+});
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.focusPageDown',
     weight: 200 ,
@@ -124,6 +159,30 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         });
     }
 });
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'list.focusAnyFirst',
+    weight: 200 ,
+    when: WorkbenchListFocusContextKey,
+    primary: 512  | 14 ,
+    handler: (accessor) => {
+        navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
+            const fakeKeyboardEvent = ( new KeyboardEvent('keydown', { altKey: true }));
+            await widget.focusFirst(fakeKeyboardEvent);
+        });
+    }
+});
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'list.focusAnyLast',
+    weight: 200 ,
+    when: WorkbenchListFocusContextKey,
+    primary: 512  | 13 ,
+    handler: (accessor) => {
+        navigate(accessor.get(IListService).lastFocusedList, async (widget) => {
+            const fakeKeyboardEvent = ( new KeyboardEvent('keydown', { altKey: true }));
+            await widget.focusLast(fakeKeyboardEvent);
+        });
+    }
+});
 function expandMultiSelection(focused, previousFocus) {
     if (focused instanceof List || focused instanceof PagedList || focused instanceof Table) {
         const list = focused;
@@ -154,6 +213,19 @@ function expandMultiSelection(focused, previousFocus) {
         }
     }
 }
+function revealFocusedStickyScroll(tree, postRevealAction) {
+    const focus = tree.getStickyScrollFocus();
+    if (focus.length === 0) {
+        throw new Error(`StickyScroll has no focus`);
+    }
+    if (focus.length > 1) {
+        throw new Error(`StickyScroll can only have a single focused item`);
+    }
+    tree.reveal(focus[0]);
+    tree.getHTMLElement().focus();
+    tree.setFocus(focus);
+    postRevealAction?.(focus[0]);
+}
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.expandSelectionDown',
     weight: 200 ,
@@ -227,6 +299,23 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         }
     }
 });
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'list.stickyScroll.collapse',
+    weight: 200  + 50,
+    when: WorkbenchTreeStickyScrollFocused,
+    primary: 15 ,
+    mac: {
+        primary: 15 ,
+        secondary: [2048  | 16 ]
+    },
+    handler: (accessor) => {
+        const widget = accessor.get(IListService).lastFocusedList;
+        if (!widget || !(widget instanceof ObjectTree || widget instanceof DataTree || widget instanceof AsyncDataTree)) {
+            return;
+        }
+        revealFocusedStickyScroll(widget, focus => widget.collapse(focus));
+    }
+});
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.collapseAll',
     weight: 200 ,
@@ -342,8 +431,8 @@ function selectElement(accessor, retainCurrentFocus) {
     const fakeKeyboardEvent = getSelectionKeyboardEvent('keydown', retainCurrentFocus);
     if (focused instanceof List || focused instanceof PagedList || focused instanceof Table) {
         const list = focused;
-        list.setSelection(list.getFocus(), fakeKeyboardEvent);
         list.setAnchor(list.getFocus()[0]);
+        list.setSelection(list.getFocus(), fakeKeyboardEvent);
     }
     else if (focused instanceof ObjectTree || focused instanceof DataTree || focused instanceof AsyncDataTree) {
         const tree = focused;
@@ -360,8 +449,8 @@ function selectElement(accessor, retainCurrentFocus) {
                 tree.toggleCollapsed(focus[0]);
             }
         }
-        tree.setSelection(focus, fakeKeyboardEvent);
         tree.setAnchor(focus[0]);
+        tree.setSelection(focus, fakeKeyboardEvent);
     }
 }
 KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -377,6 +466,23 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         selectElement(accessor, false);
     }
 });
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'list.stickyScrollselect',
+    weight: 200  + 50,
+    when: WorkbenchTreeStickyScrollFocused,
+    primary: 3 ,
+    mac: {
+        primary: 3 ,
+        secondary: [2048  | 18 ]
+    },
+    handler: (accessor) => {
+        const widget = accessor.get(IListService).lastFocusedList;
+        if (!widget || !(widget instanceof ObjectTree || widget instanceof DataTree || widget instanceof AsyncDataTree)) {
+            return;
+        }
+        revealFocusedStickyScroll(widget, focus => widget.setSelection([focus]));
+    }
+});
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.selectAndPreserveFocus',
     weight: 200 ,
@@ -477,6 +583,19 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         selectElement(accessor, true);
     }
 });
+KeybindingsRegistry.registerCommandAndKeybindingRule({
+    id: 'list.stickyScrolltoggleExpand',
+    weight: 200  + 50,
+    when: WorkbenchTreeStickyScrollFocused,
+    primary: 10 ,
+    handler: (accessor) => {
+        const widget = accessor.get(IListService).lastFocusedList;
+        if (!widget || !(widget instanceof ObjectTree || widget instanceof DataTree || widget instanceof AsyncDataTree)) {
+            return;
+        }
+        revealFocusedStickyScroll(widget);
+    }
+});
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'list.clear',
     weight: 200 ,
@@ -523,6 +642,16 @@ CommandsRegistry.registerCommand({
         }
     }
 });
+CommandsRegistry.registerCommand({
+    id: 'list.toggleFindMatchType',
+    handler: (accessor) => {
+        const widget = accessor.get(IListService).lastFocusedList;
+        if (widget instanceof AbstractTree || widget instanceof AsyncDataTree) {
+            const tree = widget;
+            tree.findMatchType = tree.findMatchType === TreeFindMatchType.Contiguous ? TreeFindMatchType.Fuzzy : TreeFindMatchType.Contiguous;
+        }
+    }
+});
 CommandsRegistry.registerCommandAlias('list.toggleKeyboardNavigation', 'list.triggerTypeNavigation');
 CommandsRegistry.registerCommandAlias('list.toggleFilterOnType', 'list.toggleFindMode');
 KeybindingsRegistry.registerCommandAndKeybindingRule({
@@ -606,3 +735,30 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
         focused.scrollLeft += 10;
     }
 });
+registerAction2(class ToggleStickyScroll extends Action2 {
+    constructor() {
+        super({
+            id: 'tree.toggleStickyScroll',
+            title: {
+                value: ( localizeWithPath(
+                    'vs/workbench/browser/actions/listCommands',
+                    'toggleTreeStickyScroll',
+                    "Toggle Tree Sticky Scroll"
+                )),
+                mnemonicTitle: ( localizeWithPath(
+                    'vs/workbench/browser/actions/listCommands',
+                    { key: 'mitoggleTreeStickyScroll', comment: ['&& denotes a mnemonic'] },
+                    "&&Toggle Tree Sticky Scroll"
+                )),
+                original: 'Toggle Tree Sticky Scroll',
+            },
+            category: 'View',
+            f1: true
+        });
+    }
+    run(accessor) {
+        const configurationService = accessor.get(IConfigurationService);
+        const newValue = !configurationService.getValue('workbench.tree.enableStickyScroll');
+        configurationService.updateValue('workbench.tree.enableStickyScroll', newValue);
+    }
+});

package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/activitybarpart.css.js';
 import './media/activityaction.css.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Part } from 'vscode/vscode/vs/workbench/browser/part';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
@@ -26,7 +26,6 @@ import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommon
 import { createAndFillInContextMenuActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { ViewContainerLocationToString, IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite';
-import { TitleBarStyleContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
 
@@ -319,13 +318,10 @@ registerAction2(class extends Action2 {
             },
             shortTitle: ( localizeWithPath('vs/workbench/browser/parts/activitybar/activitybarPart', 'side', "Side")),
             category: Categories.View,
-            toggled: ( ContextKeyExpr.or(( ContextKeyExpr.equals(
+            toggled: ( ContextKeyExpr.equals(
                 `config.${"workbench.activityBar.location" }`,
                 "side"
-            )), ( ContextKeyExpr.and(( ContextKeyExpr.equals(
-                `config.${"workbench.activityBar.location" }`,
-                "top"
-            )), ( TitleBarStyleContext.isEqualTo('native')))))),
+            )),
             menu: [{
                     id: MenuId.ActivityBarPositionMenu,
                     order: 1
@@ -368,14 +364,13 @@ registerAction2(class extends Action2 {
             )),
             menu: [{
                     id: MenuId.ActivityBarPositionMenu,
-                    when: ( TitleBarStyleContext.notEqualsTo('native')),
                     order: 2
                 }, {
                     id: MenuId.CommandPalette,
-                    when: ( ContextKeyExpr.and(( ContextKeyExpr.notEquals(
+                    when: ( ContextKeyExpr.notEquals(
                         `config.${"workbench.activityBar.location" }`,
                         "top"
-                    )), ( TitleBarStyleContext.notEqualsTo('native')))),
+                    )),
                 }]
         });
     }
@@ -488,11 +483,11 @@ registerAction2(class PreviousSideBarViewAction extends SwitchSideBarViewAction
     constructor() {
         super({
             id: 'workbench.action.previousSideBarView',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/parts/activitybar/activitybarPart',
                 'previousSideBarView',
-                "Previous Primary Side Bar View"
-            )), original: 'Previous Primary Side Bar View' },
+                'Previous Primary Side Bar View'
+            )),
             category: Categories.View,
             f1: true
         }, -1);
@@ -502,11 +497,11 @@ registerAction2(class NextSideBarViewAction extends SwitchSideBarViewAction {
     constructor() {
         super({
             id: 'workbench.action.nextSideBarView',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/parts/activitybar/activitybarPart',
                 'nextSideBarView',
-                "Next Primary Side Bar View"
-            )), original: 'Next Primary Side Bar View' },
+                'Next Primary Side Bar View'
+            )),
             category: Categories.View,
             f1: true
         }, 1);
@@ -516,11 +511,11 @@ registerAction2(class FocusActivityBarAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.focusActivityBar',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/browser/parts/activitybar/activitybarPart',
                 'focusActivityBar',
-                "Focus Activity Bar"
-            )), original: 'Focus Activity Bar' },
+                'Focus Activity Bar'
+            )),
             category: Categories.View,
             f1: true
         });

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

@@ -1,6 +1,6 @@
 import n from '../../../../../../../../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>.composite-bar-container{flex:1}.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>.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>.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.has-composite-bar>.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>.composite-bar-container{flex:1}.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>.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>.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>.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.has-composite-bar>.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 };