@codingame/monaco-vscode-quickaccess-service-override 25.1.1 → 26.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-quickaccess-service-override",
-  "version": "25.1.1",
+  "version": "26.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - quickaccess service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "25.1.1"
+    "@codingame/monaco-vscode-api": "26.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -24,12 +24,29 @@ import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/acti
 
 var AbstractCommandsQuickAccessProvider_1, CommandsHistory_1;
 let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvider extends PickerQuickAccessProvider {
-    static { AbstractCommandsQuickAccessProvider_1 = this; }
-    static { this.PREFIX = '>'; }
-    static { this.TFIDF_THRESHOLD = 0.5; }
-    static { this.TFIDF_MAX_RESULTS = 5; }
-    static { this.WORD_FILTER = or(matchesBaseContiguousSubString, matchesWords); }
-    constructor(options, instantiationService, keybindingService, commandService, telemetryService, dialogService) {
+    static {
+        AbstractCommandsQuickAccessProvider_1 = this;
+    }
+    static {
+        this.PREFIX = ">";
+    }
+    static {
+        this.TFIDF_THRESHOLD = 0.5;
+    }
+    static {
+        this.TFIDF_MAX_RESULTS = 5;
+    }
+    static {
+        this.WORD_FILTER = or(matchesBaseContiguousSubString, matchesWords);
+    }
+    constructor(
+        options,
+        instantiationService,
+        keybindingService,
+        commandService,
+        telemetryService,
+        dialogService
+    ) {
         super(AbstractCommandsQuickAccessProvider_1.PREFIX, options);
         this.keybindingService = keybindingService;
         this.commandService = commandService;
@@ -50,9 +67,9 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 textChunks: [this.getTfIdfChunk(commandPick)]
             }))));
             const result = tfidf.calculateScores(filter, token);
-            return normalizeTfIdfScores(result)
-                .filter(score => score.score > AbstractCommandsQuickAccessProvider_1.TFIDF_THRESHOLD)
-                .slice(0, AbstractCommandsQuickAccessProvider_1.TFIDF_MAX_RESULTS);
+            return normalizeTfIdfScores(result).filter(
+                score => score.score > AbstractCommandsQuickAccessProvider_1.TFIDF_THRESHOLD
+            ).slice(0, AbstractCommandsQuickAccessProvider_1.TFIDF_MAX_RESULTS);
         });
         const filteredCommandPicks = [];
         for (const commandPick of allCommandPicks) {
@@ -89,8 +106,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
             if (existingCommandForLabel) {
                 commandPick.description = commandPick.commandId;
                 existingCommandForLabel.description = existingCommandForLabel.commandId;
-            }
-            else {
+            } else {
                 mapLabelToCommand.set(commandPick.label, commandPick);
             }
         }
@@ -100,11 +116,9 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                     return commandPickA.label.localeCompare(commandPickB.label);
                 }
                 return commandPickB.tfIdfScore - commandPickA.tfIdfScore;
-            }
-            else if (commandPickA.tfIdfScore) {
+            } else if (commandPickA.tfIdfScore) {
                 return 1;
-            }
-            else if (commandPickB.tfIdfScore) {
+            } else if (commandPickB.tfIdfScore) {
                 return -1;
             }
             const commandACounter = this.commandsHistory.peek(commandPickA.commandId);
@@ -149,20 +163,32 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
             const commandPick = filteredCommandPicks[i];
             const isInHistory = !!this.commandsHistory.peek(commandPick.commandId);
             if (i === 0 && isInHistory) {
-                commandPicks.push({ type: 'separator', label: ( localize(2007, "recently used")) });
+                commandPicks.push({
+                    type: "separator",
+                    label: ( localize(2009, "recently used"))
+                });
                 addOtherSeparator = true;
             }
             if (addSuggestedSeparator && commandPick.tfIdfScore !== undefined) {
-                commandPicks.push({ type: 'separator', label: ( localize(2008, "similar commands")) });
+                commandPicks.push({
+                    type: "separator",
+                    label: ( localize(2010, "similar commands"))
+                });
                 addSuggestedSeparator = false;
             }
             if (addCommonlyUsedSeparator && commandPick.tfIdfScore === undefined && !isInHistory && this.options.suggestedCommandIds?.has(commandPick.commandId)) {
-                commandPicks.push({ type: 'separator', label: ( localize(2009, "commonly used")) });
+                commandPicks.push({
+                    type: "separator",
+                    label: ( localize(2011, "commonly used"))
+                });
                 addOtherSeparator = true;
                 addCommonlyUsedSeparator = false;
             }
             if (addOtherSeparator && commandPick.tfIdfScore === undefined && !isInHistory && !this.options.suggestedCommandIds?.has(commandPick.commandId)) {
-                commandPicks.push({ type: 'separator', label: ( localize(2010, "other commands")) });
+                commandPicks.push({
+                    type: "separator",
+                    label: ( localize(2012, "other commands"))
+                });
                 addOtherSeparator = false;
             }
             commandPicks.push(this.toCommandPick(commandPick, runOptions, isInHistory));
@@ -178,31 +204,28 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                     return [];
                 }
                 const commandPicks = ( additionalCommandPicks.map(commandPick => this.toCommandPick(commandPick, runOptions)));
-                if (addSuggestedSeparator && commandPicks[0]?.type !== 'separator') {
-                    commandPicks.unshift({ type: 'separator', label: ( localize(2008, "similar commands")) });
+                if (addSuggestedSeparator && commandPicks[0]?.type !== "separator") {
+                    commandPicks.unshift({
+                        type: "separator",
+                        label: ( localize(2010, "similar commands"))
+                    });
                 }
                 return commandPicks;
             })()
         };
     }
     toCommandPick(commandPick, runOptions, isRecentlyUsed = false) {
-        if (commandPick.type === 'separator') {
+        if (commandPick.type === "separator") {
             return commandPick;
         }
-        const tooltip = commandPick.tooltip
-            ?? commandPick.commandDescription?.value;
+        const tooltip = commandPick.tooltip ?? commandPick.commandDescription?.value;
         const keybinding = this.keybindingService.lookupKeybinding(commandPick.commandId);
-        const ariaLabel = keybinding ?
-            ( localize(2011, "{0}, {1}", commandPick.label, keybinding.getAriaLabel())) :
-            commandPick.label;
+        const ariaLabel = keybinding ? ( localize(2013, "{0}, {1}", commandPick.label, keybinding.getAriaLabel())) : commandPick.label;
         const existingButtons = commandPick.buttons || [];
-        const buttons = isRecentlyUsed ? [
-            ...existingButtons,
-            {
-                iconClass: ThemeIcon.asClassName(Codicon.close),
-                tooltip: ( localize(2012, "Remove from Recently Used"))
-            }
-        ] : commandPick.buttons;
+        const buttons = isRecentlyUsed ? [...existingButtons, {
+            iconClass: ThemeIcon.asClassName(Codicon.close),
+            tooltip: ( localize(2014, "Remove from Recently Used"))
+        }] : commandPick.buttons;
         return {
             ...commandPick,
             tooltip,
@@ -212,18 +235,15 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
             buttons,
             accept: async () => {
                 this.commandsHistory.push(commandPick.commandId);
-                this.telemetryService.publicLog2('workbenchActionExecuted', {
+                this.telemetryService.publicLog2("workbenchActionExecuted", {
                     id: commandPick.commandId,
-                    from: runOptions?.from ?? 'quick open'
+                    from: runOptions?.from ?? "quick open"
                 });
                 try {
-                    commandPick.args?.length
-                        ? await this.commandService.executeCommand(commandPick.commandId, ...commandPick.args)
-                        : await this.commandService.executeCommand(commandPick.commandId);
-                }
-                catch (error) {
+                    commandPick.args?.length ? await this.commandService.executeCommand(commandPick.commandId, ...commandPick.args) : await this.commandService.executeCommand(commandPick.commandId);
+                } catch (error) {
                     if (!isCancellationError(error)) {
-                        this.dialogService.error(( localize(2013, "Command '{0}' resulted in an error", commandPick.label)), toErrorMessage(error));
+                        this.dialogService.error(( localize(2015, "Command '{0}' resulted in an error", commandPick.label)), toErrorMessage(error));
                     }
                 }
             },
@@ -240,7 +260,13 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
             } : commandPick.trigger
         };
     }
-    getTfIdfChunk({ label, commandAlias, commandDescription }) {
+    getTfIdfChunk(
+        {
+            label,
+            commandAlias,
+            commandDescription
+        }
+    ) {
         let chunk = label;
         if (commandAlias && commandAlias !== label) {
             chunk += ` - ${commandAlias}`;
@@ -251,20 +277,26 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
         return chunk;
     }
 };
-AbstractCommandsQuickAccessProvider = AbstractCommandsQuickAccessProvider_1 = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IKeybindingService)),
-    ( __param(3, ICommandService)),
-    ( __param(4, ITelemetryService)),
-    ( __param(5, IDialogService))
-], AbstractCommandsQuickAccessProvider));
+AbstractCommandsQuickAccessProvider = AbstractCommandsQuickAccessProvider_1 = ( __decorate([( __param(1, IInstantiationService)), ( __param(2, IKeybindingService)), ( __param(3, ICommandService)), ( __param(4, ITelemetryService)), ( __param(5, IDialogService))], AbstractCommandsQuickAccessProvider));
 let CommandsHistory = class CommandsHistory extends Disposable {
-    static { CommandsHistory_1 = this; }
-    static { this.DEFAULT_COMMANDS_HISTORY_LENGTH = 50; }
-    static { this.PREF_KEY_CACHE = 'commandPalette.mru.cache'; }
-    static { this.PREF_KEY_COUNTER = 'commandPalette.mru.counter'; }
-    static { this.counter = 1; }
-    static { this.hasChanges = false; }
+    static {
+        CommandsHistory_1 = this;
+    }
+    static {
+        this.DEFAULT_COMMANDS_HISTORY_LENGTH = 50;
+    }
+    static {
+        this.PREF_KEY_CACHE = "commandPalette.mru.cache";
+    }
+    static {
+        this.PREF_KEY_COUNTER = "commandPalette.mru.counter";
+    }
+    static {
+        this.counter = 1;
+    }
+    static {
+        this.hasChanges = false;
+    }
     constructor(storageService, configurationService, logService) {
         super();
         this.storageService = storageService;
@@ -276,7 +308,9 @@ let CommandsHistory = class CommandsHistory extends Disposable {
         this.registerListeners();
     }
     registerListeners() {
-        this._register(this.configurationService.onDidChangeConfiguration(e => this.updateConfiguration(e)));
+        this._register(
+            this.configurationService.onDidChangeConfiguration(e => this.updateConfiguration(e))
+        );
         this._register(this.storageService.onWillSaveState(e => {
             if (e.reason === WillSaveStateReason.SHUTDOWN) {
                 this.saveState();
@@ -284,7 +318,7 @@ let CommandsHistory = class CommandsHistory extends Disposable {
         }));
     }
     updateConfiguration(e) {
-        if (e && !e.affectsConfiguration('workbench.commandPalette.history')) {
+        if (e && !e.affectsConfiguration("workbench.commandPalette.history")) {
             return;
         }
         this.configuredCommandsHistoryLength = CommandsHistory_1.getConfiguredCommandHistoryLength(this.configurationService);
@@ -299,8 +333,7 @@ let CommandsHistory = class CommandsHistory extends Disposable {
         if (raw) {
             try {
                 serializedCache = JSON.parse(raw);
-            }
-            catch (error) {
+            } catch (error) {
                 this.logService.error(`[CommandsHistory] invalid data: ${error}`);
             }
         }
@@ -309,13 +342,16 @@ let CommandsHistory = class CommandsHistory extends Disposable {
             let entries;
             if (serializedCache.usesLRU) {
                 entries = serializedCache.entries;
-            }
-            else {
+            } else {
                 entries = serializedCache.entries.sort((a, b) => a.value - b.value);
             }
             entries.forEach(entry => cache.set(entry.key, entry.value));
         }
-        CommandsHistory_1.counter = this.storageService.getNumber(CommandsHistory_1.PREF_KEY_COUNTER, StorageScope.PROFILE, CommandsHistory_1.counter);
+        CommandsHistory_1.counter = this.storageService.getNumber(
+            CommandsHistory_1.PREF_KEY_COUNTER,
+            StorageScope.PROFILE,
+            CommandsHistory_1.counter
+        );
     }
     push(commandId) {
         if (!CommandsHistory_1.cache) {
@@ -341,16 +377,32 @@ let CommandsHistory = class CommandsHistory extends Disposable {
         if (!CommandsHistory_1.hasChanges) {
             return;
         }
-        const serializedCache = { usesLRU: true, entries: [] };
-        CommandsHistory_1.cache.forEach((value, key) => serializedCache.entries.push({ key, value }));
-        this.storageService.store(CommandsHistory_1.PREF_KEY_CACHE, JSON.stringify(serializedCache), StorageScope.PROFILE, StorageTarget.USER);
-        this.storageService.store(CommandsHistory_1.PREF_KEY_COUNTER, CommandsHistory_1.counter, StorageScope.PROFILE, StorageTarget.USER);
+        const serializedCache = {
+            usesLRU: true,
+            entries: []
+        };
+        CommandsHistory_1.cache.forEach((value, key) => serializedCache.entries.push({
+            key,
+            value
+        }));
+        this.storageService.store(
+            CommandsHistory_1.PREF_KEY_CACHE,
+            JSON.stringify(serializedCache),
+            StorageScope.PROFILE,
+            StorageTarget.USER
+        );
+        this.storageService.store(
+            CommandsHistory_1.PREF_KEY_COUNTER,
+            CommandsHistory_1.counter,
+            StorageScope.PROFILE,
+            StorageTarget.USER
+        );
         CommandsHistory_1.hasChanges = false;
     }
     static getConfiguredCommandHistoryLength(configurationService) {
         const config = configurationService.getValue();
         const configuredCommandHistoryLength = config.workbench?.commandPalette?.history;
-        if (typeof configuredCommandHistoryLength === 'number') {
+        if (typeof configuredCommandHistoryLength === "number") {
             return configuredCommandHistoryLength;
         }
         return CommandsHistory_1.DEFAULT_COMMANDS_HISTORY_LENGTH;
@@ -362,10 +414,6 @@ let CommandsHistory = class CommandsHistory extends Disposable {
         CommandsHistory_1.hasChanges = true;
     }
 };
-CommandsHistory = CommandsHistory_1 = ( __decorate([
-    ( __param(0, IStorageService)),
-    ( __param(1, IConfigurationService)),
-    ( __param(2, ILogService))
-], CommandsHistory));
+CommandsHistory = CommandsHistory_1 = ( __decorate([( __param(0, IStorageService)), ( __param(1, IConfigurationService)), ( __param(2, ILogService))], CommandsHistory));
 
 export { AbstractCommandsQuickAccessProvider, CommandsHistory };

package/vscode/src/vs/platform/quickinput/browser/helpQuickAccess.d.ts

@@ -1,4 +1,5 @@
 import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
 import { IQuickAccessProvider } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickAccess";
 import { IQuickPick, IQuickPickItem } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput";
@@ -9,9 +10,10 @@ interface IHelpQuickAccessPickItem extends IQuickPickItem {
 export declare class HelpQuickAccessProvider implements IQuickAccessProvider {
     private readonly quickInputService;
     private readonly keybindingService;
+    private readonly contextKeyService;
     static PREFIX: string;
     private readonly registry;
-    constructor(quickInputService: IQuickInputService, keybindingService: IKeybindingService);
+    constructor(quickInputService: IQuickInputService, keybindingService: IKeybindingService, contextKeyService: IContextKeyService);
     provide(picker: IQuickPick<IHelpQuickAccessPickItem, {
         useSeparators: true;
     }>): IDisposable;

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

@@ -3,17 +3,23 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickAccess';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 
 var HelpQuickAccessProvider_1;
 let HelpQuickAccessProvider = class HelpQuickAccessProvider {
-    static { HelpQuickAccessProvider_1 = this; }
-    static { this.PREFIX = '?'; }
-    constructor(quickInputService, keybindingService) {
+    static {
+        HelpQuickAccessProvider_1 = this;
+    }
+    static {
+        this.PREFIX = "?";
+    }
+    constructor(quickInputService, keybindingService, contextKeyService) {
         this.quickInputService = quickInputService;
         this.keybindingService = keybindingService;
+        this.contextKeyService = contextKeyService;
         this.registry = ( Registry.as(Extensions.Quickaccess));
     }
     provide(picker) {
@@ -21,42 +27,43 @@ let HelpQuickAccessProvider = class HelpQuickAccessProvider {
         disposables.add(picker.onDidAccept(() => {
             const [item] = picker.selectedItems;
             if (item) {
-                this.quickInputService.quickAccess.show(item.prefix, { preserveValue: true });
+                this.quickInputService.quickAccess.show(item.prefix, {
+                    preserveValue: true
+                });
             }
         }));
         disposables.add(picker.onDidChangeValue(value => {
-            const providerDescriptor = this.registry.getQuickAccessProvider(value.substr(HelpQuickAccessProvider_1.PREFIX.length));
-            if (providerDescriptor && providerDescriptor.prefix && providerDescriptor.prefix !== HelpQuickAccessProvider_1.PREFIX) {
-                this.quickInputService.quickAccess.show(providerDescriptor.prefix, { preserveValue: true });
+            const providerDescriptor = this.registry.getQuickAccessProvider(
+                value.substr(HelpQuickAccessProvider_1.PREFIX.length),
+                this.contextKeyService
+            );
+            if (providerDescriptor?.prefix && providerDescriptor.prefix !== HelpQuickAccessProvider_1.PREFIX) {
+                this.quickInputService.quickAccess.show(providerDescriptor.prefix, {
+                    preserveValue: true
+                });
             }
         }));
         picker.items = this.getQuickAccessProviders().filter(p => p.prefix !== HelpQuickAccessProvider_1.PREFIX);
         return disposables;
     }
     getQuickAccessProviders() {
-        const providers = this.registry
-            .getQuickAccessProviders()
-            .sort((providerA, providerB) => providerA.prefix.localeCompare(providerB.prefix))
-            .flatMap(provider => this.createPicks(provider));
+        const providers = this.registry.getQuickAccessProviders(this.contextKeyService).sort((providerA, providerB) => providerA.prefix.localeCompare(providerB.prefix)).flatMap(provider => this.createPicks(provider));
         return providers;
     }
     createPicks(provider) {
         return (provider.helpEntries.map(helpEntry => {
             const prefix = helpEntry.prefix || provider.prefix;
-            const label = prefix || '\u2026' ;
+            const label = prefix || "…" ;
             return {
                 prefix,
                 label,
                 keybinding: helpEntry.commandId ? this.keybindingService.lookupKeybinding(helpEntry.commandId) : undefined,
-                ariaLabel: ( localize(2014, "{0}, {1}", label, helpEntry.description)),
+                ariaLabel: ( localize(2016, "{0}, {1}", label, helpEntry.description)),
                 description: helpEntry.description
             };
         }));
     }
 };
-HelpQuickAccessProvider = HelpQuickAccessProvider_1 = ( __decorate([
-    ( __param(0, IQuickInputService)),
-    ( __param(1, IKeybindingService))
-], HelpQuickAccessProvider));
+HelpQuickAccessProvider = HelpQuickAccessProvider_1 = ( __decorate([( __param(0, IQuickInputService)), ( __param(1, IKeybindingService)), ( __param(2, IContextKeyService))], HelpQuickAccessProvider));
 
 export { HelpQuickAccessProvider };