@codingame/monaco-vscode-api 3.2.2 → 4.0.0

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

@@ -55,6 +55,8 @@ let QuickAccessController = class QuickAccessController extends Disposable {
                 value = newValue;
             }
         }
+        const visibleSelection = visibleQuickAccess?.picker?.valueSelection;
+        const visibleValue = visibleQuickAccess?.picker?.value;
         const disposables = ( new DisposableStore());
         const picker = disposables.add(this.quickInputService.createQuickPick());
         picker.value = value;
@@ -88,6 +90,9 @@ let QuickAccessController = class QuickAccessController extends Disposable {
             pickPromise?.complete(picker.selectedItems.slice(0));
         });
         picker.show();
+        if (visibleSelection && visibleValue === value) {
+            picker.valueSelection = visibleSelection;
+        }
         if (pick) {
             return pickPromise?.p;
         }

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

@@ -7,16 +7,16 @@ import { TimeoutTimer } from '../../../base/common/async.js';
 import { Codicon } from '../../../base/common/codicons.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
-import { isIOS } from '../../../base/common/platform.js';
-import Severity from '../../../base/common/severity.js';
+import { isIOS, isMacintosh } from '../../../base/common/platform.js';
+import Severity$1 from '../../../base/common/severity.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import './media/quickInput.css.js';
 import { localizeWithPath } from '../../../nls.js';
 import { QuickInputHideReason, ItemActivation, NO_KEY_MODS } from '../common/quickInput.js';
-import { QuickInputListFocus } from './quickInputList.js';
 import { renderQuickInputDescription, quickInputButtonToAction } from './quickInputUtils.js';
 import { IConfigurationService } from '../../configuration/common/configuration.js';
 import { WorkbenchHoverDelegate, IHoverService } from '../../hover/browser/hover.js';
+import { QuickInputListFocus } from './quickInputTree.js';
 const backButton = {
     iconClass: ThemeIcon.asClassName(Codicon.quickInputBack),
     tooltip: ( localizeWithPath('vs/platform/quickinput/browser/quickInput', 'quickInput.back', "Back")),
@@ -41,13 +41,15 @@ class QuickInput extends Disposable {
         this._toggles = [];
         this.togglesUpdated = false;
         this.noValidationMessage = QuickInput.noPromptMessage;
-        this._severity = Severity.Ignore;
+        this._severity = Severity$1.Ignore;
         this.onDidTriggerButtonEmitter = this._register(( new Emitter()));
         this.onDidHideEmitter = this._register(( new Emitter()));
+        this.onWillHideEmitter = this._register(( new Emitter()));
         this.onDisposeEmitter = this._register(( new Emitter()));
         this.visibleDisposables = this._register(( new DisposableStore()));
         this.onDidTriggerButton = this.onDidTriggerButtonEmitter.event;
         this.onDidHide = this.onDidHideEmitter.event;
+        this.onWillHide = this.onWillHideEmitter.event;
         this.onDispose = this.onDisposeEmitter.event;
     }
     get title() {
@@ -184,6 +186,9 @@ class QuickInput extends Disposable {
         this.visibleDisposables.clear();
         this.onDidHideEmitter.fire({ reason });
     }
+    willHide(reason = QuickInputHideReason.Other) {
+        this.onWillHideEmitter.fire({ reason });
+    }
     update() {
         if (!this.visible) {
             return;
@@ -297,7 +302,7 @@ class QuickInput extends Disposable {
     }
     showMessageDecoration(severity) {
         this.ui.inputBox.showDecoration(severity);
-        if (severity !== Severity.Ignore) {
+        if (severity !== Severity$1.Ignore) {
             const styles = this.ui.inputBox.stylesForType(severity);
             this.ui.message.style.color = styles.foreground ? `${styles.foreground}` : '';
             this.ui.message.style.backgroundColor = styles.background ? `${styles.background}` : '';
@@ -502,6 +507,13 @@ class QuickPick extends QuickInput {
         }
         return this.ui.keyMods;
     }
+    get valueSelection() {
+        const selection = this.ui.inputBox.getSelection();
+        if (!selection) {
+            return undefined;
+        }
+        return [selection.start, selection.end];
+    }
     set valueSelection(valueSelection) {
         this._valueSelection = valueSelection;
         this.valueSelectionUpdated = true;
@@ -575,18 +587,23 @@ class QuickPick extends QuickInput {
             this.visibleDisposables.add((this._hideInput ? this.ui.list : this.ui.inputBox).onKeyDown((event) => {
                 switch (event.keyCode) {
                     case 18 :
-                        this.ui.list.focus(QuickInputListFocus.Next);
+                        if (isMacintosh ? event.metaKey : event.altKey) {
+                            this.ui.list.focus(QuickInputListFocus.NextSeparator);
+                        }
+                        else {
+                            this.ui.list.focus(QuickInputListFocus.Next);
+                        }
                         if (this.canSelectMany) {
                             this.ui.list.domFocus();
                         }
                         EventHelper.stop(event, true);
                         break;
                     case 16 :
-                        if (this.ui.list.getFocusedElements().length) {
-                            this.ui.list.focus(QuickInputListFocus.Previous);
+                        if (isMacintosh ? event.metaKey : event.altKey) {
+                            this.ui.list.focus(QuickInputListFocus.PreviousSeparator);
                         }
                         else {
-                            this.ui.list.focus(QuickInputListFocus.Last);
+                            this.ui.list.focus(QuickInputListFocus.Previous);
                         }
                         if (this.canSelectMany) {
                             this.ui.list.domFocus();
@@ -789,6 +806,7 @@ class QuickPick extends QuickInput {
         this.ui.list.sortByLabel = this.sortByLabel;
         if (this.itemsUpdated) {
             this.itemsUpdated = false;
+            const currentActiveItems = this._activeItems;
             this.ui.list.setElements(this.items);
             this.ui.list.filter(this.filterValue(this.ui.inputBox.value));
             this.ui.checkAll.checked = this.ui.list.getAllVisibleChecked();
@@ -796,6 +814,10 @@ class QuickPick extends QuickInput {
             this.ui.count.setCount(this.ui.list.getCheckedCount());
             switch (this._itemActivation) {
                 case ItemActivation.NONE:
+                    if (currentActiveItems.length > 0) {
+                        this._activeItems = [];
+                        this.onDidChangeActiveEmitter.fire(this._activeItems);
+                    }
                     this._itemActivation = ItemActivation.FIRST;
                     break;
                 case ItemActivation.SECOND:
@@ -871,6 +893,13 @@ class InputBox extends QuickInput {
         this._value = value || '';
         this.update();
     }
+    get valueSelection() {
+        const selection = this.ui.inputBox.getSelection();
+        if (!selection) {
+            return undefined;
+        }
+        return [selection.start, selection.end];
+    }
     set valueSelection(valueSelection) {
         this._valueSelection = valueSelection;
         this.valueSelectionUpdated = true;

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

@@ -1,7 +1,7 @@
 import { addStandardDisposableListener, EventType, append, $ as $$1 } from '../../../base/browser/dom.js';
 import { FindInput } from '../../../base/browser/ui/findinput/findInput.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
-import Severity from '../../../base/common/severity.js';
+import Severity$1 from '../../../base/common/severity.js';
 import './media/quickInput.css.js';
 const $ = $$1;
 class QuickInputBox extends Disposable {
@@ -34,6 +34,9 @@ class QuickInputBox extends Disposable {
     select(range = null) {
         this.findInput.inputBox.select(range);
     }
+    getSelection() {
+        return this.findInput.inputBox.getSelection();
+    }
     isSelectionAtEnd() {
         return this.findInput.inputBox.isSelectionAtEnd();
     }
@@ -68,15 +71,15 @@ class QuickInputBox extends Disposable {
         this.findInput.inputBox.inputElement.removeAttribute(name);
     }
     showDecoration(decoration) {
-        if (decoration === Severity.Ignore) {
+        if (decoration === Severity$1.Ignore) {
             this.findInput.clearMessage();
         }
         else {
-            this.findInput.showMessage({ type: decoration === Severity.Info ? 1  : decoration === Severity.Warning ? 2  : 3 , content: '' });
+            this.findInput.showMessage({ type: decoration === Severity$1.Info ? 1  : decoration === Severity$1.Warning ? 2  : 3 , content: '' });
         }
     }
     stylesForType(decoration) {
-        return this.findInput.inputBox.stylesForType(decoration === Severity.Info ? 1  : decoration === Severity.Warning ? 2  : 3 );
+        return this.findInput.inputBox.stylesForType(decoration === Severity$1.Info ? 1  : decoration === Severity$1.Warning ? 2  : 3 );
     }
     setFocus() {
         this.findInput.focus();

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

@@ -1,3 +1,4 @@
+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 { ActionBar } from '../../../base/browser/ui/actionbar/actionbar.js';
 import { Button } from '../../../base/browser/ui/button/button.js';
@@ -6,23 +7,27 @@ 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 { Disposable, dispose } from '../../../base/common/lifecycle.js';
-import Severity from '../../../base/common/severity.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 { QuickInputBox } from './quickInputBox.js';
-import { QuickInputList, QuickInputListFocus } from './quickInputList.js';
 import { backButton, QuickPick, InputBox, QuickWidget } from './quickInput.js';
+import { ILayoutService } from '../../layout/browser/layoutService.js';
 import { mainWindow } from '../../../base/browser/window.js';
+import { IInstantiationService } from '../../instantiation/common/instantiation.js';
+import { QuickInputTree, QuickInputListFocus } from './quickInputTree.js';
+var QuickInputController_1;
 const $ = $$1;
-class QuickInputController extends Disposable {
+let QuickInputController = class QuickInputController extends Disposable {
+    static { QuickInputController_1 = this; }
     static { this.MAX_WIDTH = 600; }
     get container() { return this._container; }
-    constructor(options, themeService, layoutService) {
+    constructor(options, layoutService, instantiationService) {
         super();
         this.options = options;
-        this.themeService = themeService;
         this.layoutService = layoutService;
+        this.instantiationService = instantiationService;
         this.enabled = true;
         this.onDidAcceptEmitter = this._register(( new Emitter()));
         this.onDidCustomEmitter = this._register(( new Emitter()));
@@ -130,7 +135,7 @@ class QuickInputController extends Disposable {
         widget.tabIndex = -1;
         const description1 = append(container, $('.quick-input-description'));
         const listId = this.idPrefix + 'list';
-        const list = this._register(( new QuickInputList(container, listId, this.options, this.themeService)));
+        const list = this._register(this.instantiationService.createInstance(QuickInputTree, container, this.options.hoverDelegate, this.options.linkOpenerDelegate, listId));
         inputBox.setAttribute('aria-controls', listId);
         this._register(list.onDidChangeFocus(() => {
             inputBox.setAttribute('aria-activedescendant', list.getActiveDescendant() ?? '');
@@ -384,7 +389,7 @@ class QuickInputController extends Disposable {
     }
     setValidationOnInput(input, validationResult) {
         if (validationResult && isString(validationResult)) {
-            input.severity = Severity.Error;
+            input.severity = Severity$1.Error;
             input.validationMessage = validationResult;
         }
         else if (validationResult && !isString(validationResult)) {
@@ -392,7 +397,7 @@ class QuickInputController extends Disposable {
             input.validationMessage = validationResult.content;
         }
         else {
-            input.severity = Severity.Ignore;
+            input.severity = Severity$1.Ignore;
             input.validationMessage = undefined;
         }
     }
@@ -427,7 +432,7 @@ class QuickInputController extends Disposable {
                         validationValue = value;
                     }
                     validation.then(result => {
-                        if (!result || (!isString(result) && result.severity !== Severity.Error)) {
+                        if (!result || (!isString(result) && result.severity !== Severity$1.Error)) {
                             resolve(value);
                             input.hide();
                         }
@@ -482,7 +487,7 @@ class QuickInputController extends Disposable {
         ui.checkAll.checked = false;
         ui.inputBox.placeholder = '';
         ui.inputBox.password = false;
-        ui.inputBox.showDecoration(Severity.Ignore);
+        ui.inputBox.showDecoration(Severity$1.Ignore);
         ui.visibleCount.setCount(0);
         ui.count.setCount(0);
         reset(ui.message);
@@ -551,6 +556,7 @@ class QuickInputController extends Disposable {
         if (!controller) {
             return;
         }
+        controller.willHide(reason);
         const container = this.ui?.container;
         const focusChanged = container && !isAncestorOfActiveElement(container);
         this.controller = null;
@@ -617,7 +623,7 @@ class QuickInputController extends Disposable {
         if (this.ui && this.isVisible()) {
             this.ui.container.style.top = `${this.titleBarOffset}px`;
             const style = this.ui.container.style;
-            const width = Math.min(this.dimension.width * 0.62 , QuickInputController.MAX_WIDTH);
+            const width = Math.min(this.dimension.width * 0.62 , QuickInputController_1.MAX_WIDTH);
             style.width = width + 'px';
             style.marginLeft = '-' + (width / 2) + 'px';
             this.ui.inputBox.layout();
@@ -676,5 +682,9 @@ class QuickInputController extends Disposable {
             }
         }
     }
-}
+};
+QuickInputController = QuickInputController_1 = ( __decorate([
+    ( __param(1, ILayoutService)),
+    ( __param(2, IInstantiationService))
+], QuickInputController));
 export { QuickInputController };

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

@@ -4,11 +4,20 @@ import { Emitter } from '../../../base/common/event.js';
 import { RawContextKey, IContextKeyService } from '../../contextkey/common/contextkey.js';
 import { IInstantiationService } from '../../instantiation/common/instantiation.js';
 import { ILayoutService } from '../../layout/browser/layoutService.js';
-import { WorkbenchList } from '../../list/browser/listService.js';
 import { IOpenerService } from '../../opener/common/opener.js';
 import { QuickAccessController } from './quickAccess.js';
 import { defaultInputBoxStyles, defaultToggleStyles, defaultCountBadgeStyles, defaultButtonStyles, defaultProgressBarStyles, defaultKeybindingLabelStyles, getListStyles } from '../../theme/browser/defaultStyles.js';
-import { asCssVariable, quickInputBackground, quickInputForeground, quickInputTitleBackground, widgetBorder, widgetShadow, quickInputListFocusBackground, quickInputListFocusForeground, quickInputListFocusIconForeground, activeContrastBorder, pickerGroupBorder, pickerGroupForeground } from '../../theme/common/colorRegistry.js';
+import { asCssVariable } from '../../theme/common/colorUtils.js';
+import { activeContrastBorder } from '../../theme/common/colors/baseColors.js';
+import '../../theme/common/colors/chartsColors.js';
+import { widgetBorder, widgetShadow } from '../../theme/common/colors/editorColors.js';
+import '../../theme/common/colors/inputColors.js';
+import '../../theme/common/colors/listColors.js';
+import '../../theme/common/colors/menuColors.js';
+import '../../theme/common/colors/minimapColors.js';
+import '../../theme/common/colors/miscColors.js';
+import { quickInputBackground, quickInputForeground, quickInputTitleBackground, quickInputListFocusBackground, quickInputListFocusForeground, quickInputListFocusIconForeground, pickerGroupBorder, pickerGroupForeground } from '../../theme/common/colors/quickpickColors.js';
+import '../../theme/common/colors/searchColors.js';
 import { Themable, IThemeService } from '../../theme/common/themeService.js';
 import { QuickInputHoverDelegate } from './quickInput.js';
 import { QuickInputController } from './quickInputController.js';
@@ -55,14 +64,13 @@ let QuickInputService = class QuickInputService extends Themable {
                 });
             },
             returnFocus: () => host.focus(),
-            createList: (user, container, delegate, renderers, options) => this.instantiationService.createInstance(WorkbenchList, user, container, delegate, renderers, options),
             styles: this.computeStyles(),
             hoverDelegate: this._register(this.instantiationService.createInstance(QuickInputHoverDelegate))
         };
-        const controller = this._register(( new QuickInputController({
+        const controller = this._register(this.instantiationService.createInstance(QuickInputController, {
             ...defaultOptions,
             ...options
-        }, this.themeService, this.layoutService)));
+        }));
         controller.layout(host.activeContainerDimension, host.activeContainerOffset.quickPickTop);
         this._register(host.onDidLayoutActiveContainer(dimension => {
             if (getWindow(host.activeContainer) === getWindow(controller.container)) {