@codingame/monaco-vscode-api 5.2.0 → 6.0.0

package/vscode/src/vs/platform/quickinput/browser/quickInputController.js

@@ -1,34 +1,39 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { onDidRegisterWindow, onWillUnregisterWindow, getWindow, EventType, addDisposableListener, append, createStyleSheet, addStandardDisposableListener, reset, isAncestorOfActiveElement, $ as $$1, trackFocus, isAncestor, EventHelper } from '../../../base/browser/dom.js';
+import { onDidRegisterWindow, onWillUnregisterWindow, getWindow, EventType, addDisposableListener, append, createStyleSheet, addStandardDisposableListener, reset, isAncestorOfActiveElement, $ as $$1, trackFocus, isAncestor, isHTMLElement, EventHelper } from '../../../base/browser/dom.js';
 import { ActionBar } from '../../../base/browser/ui/actionbar/actionbar.js';
 import { Button } from '../../../base/browser/ui/button/button.js';
 import { CountBadge } from '../../../base/browser/ui/countBadge/countBadge.js';
 import { ProgressBar } from '../../../base/browser/ui/progressbar/progressbar.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { Emitter, Event } from '../../../base/common/event.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
 import { Disposable, dispose } from '../../../base/common/lifecycle.js';
 import Severity$1 from '../../../base/common/severity.js';
 import { isString } from '../../../base/common/types.js';
 import { localizeWithPath } from '../../../nls.js';
-import { QuickInputHideReason } from '../common/quickInput.js';
+import { QuickInputHideReason, QuickPickFocus } from '../common/quickInput.js';
 import { QuickInputBox } from './quickInputBox.js';
-import { backButton, QuickPick, InputBox, QuickWidget } from './quickInput.js';
+import { InQuickInputContextKey, QuickInputTypeContextKey, EndOfQuickInputBoxContextKey, backButton, QuickPick, InputBox, QuickWidget } from './quickInput.js';
 import { ILayoutService } from '../../layout/browser/layoutService.service.js';
 import { mainWindow } from '../../../base/browser/window.js';
 import { IInstantiationService } from '../../instantiation/common/instantiation.js';
-import { QuickInputTree, QuickInputListFocus } from './quickInputTree.js';
+import { QuickInputTree } from './quickInputTree.js';
+import { IContextKeyService } from '../../contextkey/common/contextkey.service.js';
+import './quickInputActions.js';
 var QuickInputController_1;
 const _moduleId = "vs/platform/quickinput/browser/quickInputController";
 const $ = $$1;
 let QuickInputController = class QuickInputController extends Disposable {
     static { QuickInputController_1 = this; }
     static { this.MAX_WIDTH = 600; }
+    get currentQuickInput() { return this.controller ?? undefined; }
     get container() { return this._container; }
-    constructor(options, layoutService, instantiationService) {
+    constructor(options, layoutService, instantiationService, contextKeyService) {
         super();
         this.options = options;
         this.layoutService = layoutService;
         this.instantiationService = instantiationService;
+        this.contextKeyService = contextKeyService;
         this.enabled = true;
         this.onDidAcceptEmitter = this._register(( (new Emitter())));
         this.onDidCustomEmitter = this._register(( (new Emitter())));
@@ -39,6 +44,9 @@ let QuickInputController = class QuickInputController extends Disposable {
         this.onShow = this.onShowEmitter.event;
         this.onHideEmitter = this._register(( (new Emitter())));
         this.onHide = this.onHideEmitter.event;
+        this.inQuickInputContext = InQuickInputContextKey.bindTo(this.contextKeyService);
+        this.quickInputTypeContext = QuickInputTypeContextKey.bindTo(this.contextKeyService);
+        this.endOfQuickInputBoxContext = EndOfQuickInputBoxContextKey.bindTo(this.contextKeyService);
         this.backButton = backButton;
         this.idPrefix = options.idPrefix;
         this._container = options.container;
@@ -152,17 +160,33 @@ let QuickInputController = class QuickInputController extends Disposable {
         const focusTracker = trackFocus(container);
         this._register(focusTracker);
         this._register(addDisposableListener(container, EventType.FOCUS, e => {
-            if (isAncestor(e.relatedTarget, container)) {
+            const ui = this.getUI();
+            if (isAncestor(e.relatedTarget, ui.inputContainer)) {
+                const value = ui.inputBox.isSelectionAtEnd();
+                if (this.endOfQuickInputBoxContext.get() !== value) {
+                    this.endOfQuickInputBoxContext.set(value);
+                }
+            }
+            if (isAncestor(e.relatedTarget, ui.container)) {
                 return;
             }
-            this.previousFocusElement = e.relatedTarget instanceof HTMLElement ? e.relatedTarget : undefined;
+            this.inQuickInputContext.set(true);
+            this.previousFocusElement = isHTMLElement(e.relatedTarget) ? e.relatedTarget : undefined;
         }, true));
         this._register(focusTracker.onDidBlur(() => {
             if (!this.getUI().ignoreFocusOut && !this.options.ignoreFocusOut()) {
                 this.hide(QuickInputHideReason.Blur);
             }
+            this.inQuickInputContext.set(false);
+            this.endOfQuickInputBoxContext.set(false);
             this.previousFocusElement = undefined;
         }));
+        this._register(inputBox.onKeyDown(_ => {
+            const value = this.getUI().inputBox.isSelectionAtEnd();
+            if (this.endOfQuickInputBoxContext.get() !== value) {
+                this.endOfQuickInputBoxContext.set(value);
+            }
+        }));
         this._register(addDisposableListener(container, EventType.FOCUS, (e) => {
             inputBox.setFocus();
         }));
@@ -171,17 +195,17 @@ let QuickInputController = class QuickInputController extends Disposable {
                 return;
             }
             switch (event.keyCode) {
-                case 3 :
+                case KeyCode.Enter:
                     EventHelper.stop(event, true);
                     if (this.enabled) {
                         this.onDidAcceptEmitter.fire();
                     }
                     break;
-                case 9 :
+                case KeyCode.Escape:
                     EventHelper.stop(event, true);
                     this.hide(QuickInputHideReason.Gesture);
                     break;
-                case 2 :
+                case KeyCode.Tab:
                     if (!event.altKey && !event.ctrlKey && !event.metaKey) {
                         const selectors = [
                             '.quick-input-list .monaco-action-bar .always-visible',
@@ -217,7 +241,7 @@ let QuickInputController = class QuickInputController extends Disposable {
                         }
                     }
                     break;
-                case 10 :
+                case KeyCode.Space:
                     if (event.ctrlKey) {
                         EventHelper.stop(event, true);
                         this.getUI().list.toggleHover();
@@ -503,6 +527,7 @@ let QuickInputController = class QuickInputController extends Disposable {
         ui.container.style.display = '';
         this.updateLayout();
         ui.inputBox.setFocus();
+        this.quickInputTypeContext.set(controller.type);
     }
     isVisible() {
         return !!this.ui && this.ui.container.style.display !== 'none';
@@ -587,7 +612,7 @@ let QuickInputController = class QuickInputController extends Disposable {
     }
     navigate(next, quickNavigate) {
         if (this.isVisible() && this.getUI().list.isDisplayed()) {
-            this.getUI().list.focus(next ? QuickInputListFocus.Next : QuickInputListFocus.Previous);
+            this.getUI().list.focus(next ? QuickPickFocus.Next : QuickPickFocus.Previous);
             if (quickNavigate && this.controller instanceof QuickPick) {
                 this.controller.quickNavigate = quickNavigate;
             }
@@ -675,6 +700,7 @@ let QuickInputController = class QuickInputController extends Disposable {
 };
 QuickInputController = QuickInputController_1 = ( (__decorate([
     ( (__param(1, ILayoutService))),
-    ( (__param(2, IInstantiationService)))
+    ( (__param(2, IInstantiationService))),
+    ( (__param(3, IContextKeyService)))
 ], QuickInputController)));
 export { QuickInputController };

package/vscode/src/vs/platform/quickinput/browser/quickInputService.js

@@ -34,6 +34,7 @@ let QuickInputService = class QuickInputService extends Themable {
         return this._controller;
     }
     get hasController() { return !!this._controller; }
+    get currentQuickInput() { return this.controller.currentQuickInput; }
     get quickAccess() {
         if (!this._quickAccess) {
             this._quickAccess = this._register(this.instantiationService.createInstance(QuickAccessController));

package/vscode/src/vs/platform/quickinput/browser/quickInputTree.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { addStandardDisposableListener, asCSSUrl, append, EventType, prepend, addDisposableListener, isAncestor, $ as $$1 } from '../../../base/browser/dom.js';
+import { addStandardDisposableListener, asCSSUrl, append, EventType, prepend, addDisposableListener, isHTMLAnchorElement, isAncestor, $ as $$1 } from '../../../base/browser/dom.js';
 import { Emitter, Event } from '../../../base/common/event.js';
 import { localizeWithPath } from '../../../nls.js';
 import { IInstantiationService } from '../../instantiation/common/instantiation.js';
@@ -7,7 +7,8 @@ import { WorkbenchObjectTree } from '../../list/browser/listService.js';
 import { IThemeService } from '../../theme/common/themeService.service.js';
 import { DisposableStore, Disposable } from '../../../base/common/lifecycle.js';
 import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
-import { OS, isMacintosh } from '../../../base/common/platform.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
+import { OS } from '../../../base/common/platform.js';
 import { memoize } from '../../../base/common/decorators.js';
 import { IconLabel } from '../../../base/browser/ui/iconLabel/iconLabel.js';
 import { KeybindingLabel } from '../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
@@ -17,26 +18,17 @@ import { URI } from '../../../base/common/uri.js';
 import { quickInputButtonToAction } from './quickInputUtils.js';
 import { Lazy } from '../../../base/common/lazy.js';
 import { matchesFuzzyIconAware, parseLabelWithIcons, getCodiconAriaLabel } from '../../../base/common/iconLabels.js';
+import { HoverPosition } from '../../../base/browser/ui/hover/hoverWidget.js';
 import { compareAnything } from '../../../base/common/comparers.js';
 import { ltrim } from '../../../base/common/strings.js';
 import { RenderIndentGuides } from '../../../base/browser/ui/tree/abstractTree.js';
 import { ThrottledDelayer } from '../../../base/common/async.js';
 import { isCancellationError } from '../../../base/common/errors.js';
+import { QuickPickFocus } from '../common/quickInput.js';
+import { IAccessibilityService } from '../../accessibility/common/accessibility.service.js';
 var QuickPickItemElementRenderer_1;
 const _moduleId = "vs/platform/quickinput/browser/quickInputTree";
 const $ = $$1;
-var QuickInputListFocus;
-( ((function(QuickInputListFocus) {
-    QuickInputListFocus[QuickInputListFocus["First"] = 1] = "First";
-    QuickInputListFocus[QuickInputListFocus["Second"] = 2] = "Second";
-    QuickInputListFocus[QuickInputListFocus["Last"] = 3] = "Last";
-    QuickInputListFocus[QuickInputListFocus["Next"] = 4] = "Next";
-    QuickInputListFocus[QuickInputListFocus["Previous"] = 5] = "Previous";
-    QuickInputListFocus[QuickInputListFocus["NextPage"] = 6] = "NextPage";
-    QuickInputListFocus[QuickInputListFocus["PreviousPage"] = 7] = "PreviousPage";
-    QuickInputListFocus[QuickInputListFocus["NextSeparator"] = 8] = "NextSeparator";
-    QuickInputListFocus[QuickInputListFocus["PreviousSeparator"] = 9] = "PreviousSeparator";
-})(QuickInputListFocus || (QuickInputListFocus = {}))));
 class BaseQuickPickItemElement {
     constructor(index, hasCheckbox, mainItem) {
         this.index = index;
@@ -488,11 +480,12 @@ class QuickPickSeparatorElementRenderer extends BaseQuickInputListRenderer {
     }
 }
 let QuickInputTree = class QuickInputTree extends Disposable {
-    constructor(parent, hoverDelegate, linkOpenerDelegate, id, instantiationService) {
+    constructor(parent, hoverDelegate, linkOpenerDelegate, id, instantiationService, accessibilityService) {
         super();
         this.parent = parent;
         this.hoverDelegate = hoverDelegate;
         this.linkOpenerDelegate = linkOpenerDelegate;
+        this.accessibilityService = accessibilityService;
         this._onKeyDown = ( (new Emitter()));
         this.onKeyDown = this._onKeyDown.event;
         this._onLeave = ( (new Emitter()));
@@ -509,7 +502,6 @@ let QuickInputTree = class QuickInputTree extends Disposable {
         this.onButtonTriggered = this._onButtonTriggered.event;
         this._onSeparatorButtonTriggered = ( (new Emitter()));
         this.onSeparatorButtonTriggered = this._onSeparatorButtonTriggered.event;
-        this._onTriggerEmptySelectionOrFocus = ( (new Emitter()));
         this._elementChecked = ( (new Emitter()));
         this._inputElements = ( (new Array()));
         this._elementTree = ( (new Array()));
@@ -522,6 +514,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
         this._matchOnLabelMode = 'fuzzy';
         this._matchOnMeta = true;
         this._sortByLabel = true;
+        this._shouldLoop = true;
         this._container = append(this.parent, $('.quick-input-list'));
         this._separatorRenderer = ( (new QuickPickSeparatorElementRenderer(hoverDelegate)));
         this._itemRenderer = instantiationService.createInstance(QuickPickItemElementRenderer, hoverDelegate);
@@ -535,23 +528,6 @@ let QuickInputTree = class QuickInputTree extends Disposable {
             indent: 0,
             horizontalScrolling: false,
             allowNonCollapsibleParents: true,
-            identityProvider: {
-                getId: element => {
-                    const mainItem = element.item || element.separator;
-                    if (mainItem === undefined) {
-                        return '';
-                    }
-                    if (mainItem.id !== undefined) {
-                        return mainItem.id;
-                    }
-                    let id = `label:${mainItem.label}`;
-                    id += `$$description:${mainItem.description}`;
-                    if (mainItem.type !== 'separator') {
-                        id += `$$detail:${mainItem.detail}`;
-                    }
-                    return id;
-                },
-            },
             alwaysConsumeMouseWheel: true
         }));
         this._tree.getHTMLElement().id = id;
@@ -560,20 +536,17 @@ let QuickInputTree = class QuickInputTree extends Disposable {
     get onDidChangeFocus() {
         return (
              (Event.map(
-                Event.any(this._tree.onDidChangeFocus, this._onTriggerEmptySelectionOrFocus.event),
+                this._tree.onDidChangeFocus,
                 e => ( (e.elements.filter((e) => e instanceof QuickPickItemElement).map(e => e.item)))
             ))
         );
     }
     get onDidChangeSelection() {
         return (
-             (Event.map(
-                Event.any(this._tree.onDidChangeSelection, this._onTriggerEmptySelectionOrFocus.event),
-                e => ({
-                    items: ( (e.elements.filter((e) => e instanceof QuickPickItemElement).map(e => e.item))),
-                    event: e.browserEvent
-                })
-            ))
+             (Event.map(this._tree.onDidChangeSelection, e => ({
+                items: ( (e.elements.filter((e) => e instanceof QuickPickItemElement).map(e => e.item))),
+                event: e.browserEvent
+            })))
         );
     }
     get scrollTop() {
@@ -627,6 +600,12 @@ let QuickInputTree = class QuickInputTree extends Disposable {
     set sortByLabel(value) {
         this._sortByLabel = value;
     }
+    get shouldLoop() {
+        return this._shouldLoop;
+    }
+    set shouldLoop(value) {
+        this._shouldLoop = value;
+    }
     _registerListeners() {
         this._registerOnKeyDown();
         this._registerOnContainerClick();
@@ -641,28 +620,9 @@ let QuickInputTree = class QuickInputTree extends Disposable {
         this._register(this._tree.onKeyDown(e => {
             const event = ( (new StandardKeyboardEvent(e)));
             switch (event.keyCode) {
-                case 10 :
+                case KeyCode.Space:
                     this.toggleCheckbox();
                     break;
-                case 31 :
-                    if (isMacintosh ? e.metaKey : e.ctrlKey) {
-                        this._tree.setFocus(this._itemElements);
-                    }
-                    break;
-                case 16 : {
-                    const focus1 = this._tree.getFocus();
-                    if (focus1.length === 1 && focus1[0] === this._itemElements[0]) {
-                        this._onLeave.fire();
-                    }
-                    break;
-                }
-                case 18 : {
-                    const focus2 = this._tree.getFocus();
-                    if (focus2.length === 1 && focus2[0] === this._itemElements[this._itemElements.length - 1]) {
-                        this._onLeave.fire();
-                    }
-                    break;
-                }
             }
             this._onKeyDown.fire(event);
         }));
@@ -695,12 +655,12 @@ let QuickInputTree = class QuickInputTree extends Disposable {
     _registerHoverListeners() {
         const delayer = this._register(( (new ThrottledDelayer(this.hoverDelegate.delay))));
         this._register(this._tree.onMouseOver(async (e) => {
-            if (e.browserEvent.target instanceof HTMLAnchorElement) {
+            if (isHTMLAnchorElement(e.browserEvent.target)) {
                 delayer.cancel();
                 return;
             }
             if (
-            !(e.browserEvent.relatedTarget instanceof HTMLAnchorElement) &&
+            !(isHTMLAnchorElement(e.browserEvent.relatedTarget)) &&
                 isAncestor(e.browserEvent.relatedTarget, e.element?.element)) {
                 return;
             }
@@ -876,6 +836,17 @@ let QuickInputTree = class QuickInputTree extends Disposable {
         }
         this._tree.setChildren(null, elements);
         this._onChangedVisibleCount.fire(visibleCount);
+        if (this.accessibilityService.isScreenReaderOptimized()) {
+            setTimeout(() => {
+                const focusedElement = this._tree.getHTMLElement().querySelector(`.monaco-list-row.focused`);
+                const parent = focusedElement?.parentNode;
+                if (focusedElement && parent) {
+                    const nextSibling = focusedElement.nextSibling;
+                    parent.removeChild(focusedElement);
+                    parent.insertBefore(focusedElement, nextSibling);
+                }
+            }, 0);
+        }
     }
     getElementsCount() {
         return this._inputElements.length;
@@ -938,33 +909,40 @@ let QuickInputTree = class QuickInputTree extends Disposable {
         if (!this._itemElements.length) {
             return;
         }
-        if (what === QuickInputListFocus.Second && this._itemElements.length < 2) {
-            what = QuickInputListFocus.First;
+        if (what === QuickPickFocus.Second && this._itemElements.length < 2) {
+            what = QuickPickFocus.First;
         }
         switch (what) {
-            case QuickInputListFocus.First:
+            case QuickPickFocus.First:
                 this._tree.scrollTop = 0;
                 this._tree.focusFirst(undefined, (e) => e.element instanceof QuickPickItemElement);
                 break;
-            case QuickInputListFocus.Second:
+            case QuickPickFocus.Second:
                 this._tree.scrollTop = 0;
                 this._tree.setFocus([this._itemElements[1]]);
                 break;
-            case QuickInputListFocus.Last:
+            case QuickPickFocus.Last:
                 this._tree.scrollTop = this._tree.scrollHeight;
                 this._tree.setFocus([this._itemElements[this._itemElements.length - 1]]);
                 break;
-            case QuickInputListFocus.Next:
-                this._tree.focusNext(undefined, true, undefined, (e) => {
+            case QuickPickFocus.Next: {
+                const prevFocus = this._tree.getFocus();
+                this._tree.focusNext(undefined, this._shouldLoop, undefined, (e) => {
                     if (!(e.element instanceof QuickPickItemElement)) {
                         return false;
                     }
                     this._tree.reveal(e.element);
                     return true;
                 });
+                const currentFocus = this._tree.getFocus();
+                if (prevFocus.length && prevFocus[0] === currentFocus[0] && prevFocus[0] === this._itemElements[this._itemElements.length - 1]) {
+                    this._onLeave.fire();
+                }
                 break;
-            case QuickInputListFocus.Previous:
-                this._tree.focusPrevious(undefined, true, undefined, (e) => {
+            }
+            case QuickPickFocus.Previous: {
+                const prevFocus = this._tree.getFocus();
+                this._tree.focusPrevious(undefined, this._shouldLoop, undefined, (e) => {
                     if (!(e.element instanceof QuickPickItemElement)) {
                         return false;
                     }
@@ -977,8 +955,13 @@ let QuickInputTree = class QuickInputTree extends Disposable {
                     }
                     return true;
                 });
+                const currentFocus = this._tree.getFocus();
+                if (prevFocus.length && prevFocus[0] === currentFocus[0] && prevFocus[0] === this._itemElements[0]) {
+                    this._onLeave.fire();
+                }
                 break;
-            case QuickInputListFocus.NextPage:
+            }
+            case QuickPickFocus.NextPage:
                 this._tree.focusNextPage(undefined, (e) => {
                     if (!(e.element instanceof QuickPickItemElement)) {
                         return false;
@@ -987,7 +970,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
                     return true;
                 });
                 break;
-            case QuickInputListFocus.PreviousPage:
+            case QuickPickFocus.PreviousPage:
                 this._tree.focusPreviousPage(undefined, (e) => {
                     if (!(e.element instanceof QuickPickItemElement)) {
                         return false;
@@ -1002,7 +985,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
                     return true;
                 });
                 break;
-            case QuickInputListFocus.NextSeparator: {
+            case QuickPickFocus.NextSeparator: {
                 let foundSeparatorAsItem = false;
                 const before = this._tree.getFocus()[0];
                 this._tree.focusNext(undefined, true, undefined, (e) => {
@@ -1042,7 +1025,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
                 }
                 break;
             }
-            case QuickInputListFocus.PreviousSeparator: {
+            case QuickPickFocus.PreviousSeparator: {
                 let focusElement;
                 let foundSeparator = !!this._tree.getFocus()[0]?.separator;
                 this._tree.focusPrevious(undefined, true, undefined, (e) => {
@@ -1205,13 +1188,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
                 });
             }
         }
-        const before = this._tree.getFocus().length;
         this._tree.setChildren(null, elements);
-        if (before > 0 && elements.length === 0) {
-            this._onTriggerEmptySelectionOrFocus.fire({
-                elements: []
-            });
-        }
         this._tree.layout();
         this._onChangedAllVisibleChecked.fire(this.getAllVisibleChecked());
         this._onChangedVisibleCount.fire(shownElements.length);
@@ -1310,7 +1287,7 @@ let QuickInputTree = class QuickInputTree extends Disposable {
             },
             container: this._container,
             position: {
-                hoverPosition: 1
+                hoverPosition: HoverPosition.RIGHT
             }
         }, false);
     }
@@ -1322,7 +1299,8 @@ QuickInputTree.__decorator = ( (__decorate([
     memoize
 ], QuickInputTree.prototype, "onDidChangeSelection", null)));
 QuickInputTree = ( (__decorate([
-    ( (__param(4, IInstantiationService)))
+    ( (__param(4, IInstantiationService))),
+    ( (__param(5, IAccessibilityService)))
 ], QuickInputTree)));
 function matchesContiguousIconAware(query, target) {
     const { text, iconOffsets } = target;
@@ -1362,4 +1340,4 @@ function compareEntries(elementA, elementB, lookFor) {
     }
     return compareAnything(elementA.saneSortLabel, elementB.saneSortLabel, lookFor);
 }
-export { QuickInputListFocus, QuickInputTree };
+export { QuickInputTree };

package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js

@@ -5,6 +5,7 @@ import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
 import { Gesture, EventType as EventType$1 } from '../../../base/browser/touch.js';
 import { renderLabelWithIcons } from '../../../base/browser/ui/iconLabel/iconLabels.js';
 import { IdGenerator } from '../../../base/common/idGenerator.js';
+import { KeyCode } from '../../../base/common/keyCodes.js';
 import { parseLinkedText } from '../../../base/common/linkedText.js';
 import './media/quickInput.css.js';
 import { localizeWithPath } from '../../../nls.js';
@@ -75,7 +76,7 @@ function renderQuickInputDescription(description, container, actionHandler) {
             const onKeydown = actionHandler.disposables.add(( (new DomEmitter(anchor, EventType.KEY_DOWN)))).event;
             const onSpaceOrEnter = Event.chain(onKeydown, $ => $.filter(e => {
                 const event = ( (new StandardKeyboardEvent(e)));
-                return event.equals(10 ) || event.equals(3 );
+                return event.equals(KeyCode.Space) || event.equals(KeyCode.Enter);
             }));
             actionHandler.disposables.add(Gesture.addTarget(anchor));
             const onTap = actionHandler.disposables.add(( (new DomEmitter(anchor, EventType$1.Tap)))).event;

package/vscode/src/vs/platform/quickinput/browser/quickPickPin.js

@@ -1,5 +1,6 @@
 import { Codicon } from '../../../base/common/codicons.js';
 import { localizeWithPath } from '../../../nls.js';
+import { StorageScope, StorageTarget } from '../../storage/common/storage.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 const _moduleId = "vs/platform/quickinput/browser/quickPickPin";
 const pinButtonClass = ThemeIcon.asClassName(Codicon.pin);
@@ -85,11 +86,11 @@ function updatePinnedItems(storageKey, changedItem, storageService) {
     else {
         items.push(changedItem);
     }
-    storageService.store(storageKey, JSON.stringify(items), 1 , 1 );
+    storageService.store(storageKey, JSON.stringify(items), StorageScope.WORKSPACE, StorageTarget.MACHINE);
     return items;
 }
 function getPinnedItems(storageKey, storageService) {
-    const items = storageService.get(storageKey, 1 );
+    const items = storageService.get(storageKey, StorageScope.WORKSPACE);
     return items ? JSON.parse(items) : [];
 }
 export { showWithPinnedItems };

package/vscode/src/vs/platform/quickinput/common/quickAccess.d.ts

@@ -6,6 +6,13 @@ import { IQuickPickItem, IQuickNavigateConfiguration, ItemActivation } from './q
  */
 interface IQuickAccessProviderRunOptions {
     readonly from?: string;
+    readonly placeholder?: string;
+    /**
+     * A handler to invoke when an item is accepted for
+     * this particular showing of the quick access.
+     * @param item The item that was accepted.
+     */
+    readonly handleAccept?: (item: IQuickPickItem) => void;
 }
 interface IQuickAccessOptions {
     /**
@@ -27,6 +34,15 @@ interface IQuickAccessOptions {
      * quick access.
      */
     readonly providerOptions?: IQuickAccessProviderRunOptions;
+    /**
+     * An array of provider prefixes to enable for this
+     * particular showing of the quick access.
+     */
+    readonly enabledProviderPrefixes?: string[];
+    /**
+     * A placeholder to use for this particular showing of the quick access.
+    */
+    readonly placeholder?: string;
 }
 interface IQuickAccessController {
     /**