@codingame/monaco-vscode-quickaccess-service-override 4.5.1 → 5.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-quickaccess-service-override",
-  "version": "4.5.1",
+  "version": "5.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.5.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@5.0.0"
   }
 }

package/vscode/src/vs/editor/contrib/quickAccess/browser/commandsQuickAccess.js

@@ -1,4 +1,5 @@
 import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
+import { isLocalizedString } from 'vscode/vscode/vs/platform/action/common/action';
 import { AbstractCommandsQuickAccessProvider } from '../../../../platform/quickinput/browser/commandsQuickAccess.js';
 
 class AbstractEditorCommandsQuickAccessProvider extends AbstractCommandsQuickAccessProvider {
@@ -12,9 +13,19 @@ class AbstractEditorCommandsQuickAccessProvider extends AbstractCommandsQuickAcc
         }
         const editorCommandPicks = [];
         for (const editorAction of activeTextEditorControl.getSupportedActions()) {
+            let commandDescription;
+            if (editorAction.metadata?.description) {
+                if (isLocalizedString(editorAction.metadata.description)) {
+                    commandDescription = editorAction.metadata.description;
+                }
+                else {
+                    commandDescription = { original: editorAction.metadata.description, value: editorAction.metadata.description };
+                }
+            }
             editorCommandPicks.push({
                 commandId: editorAction.id,
                 commandAlias: editorAction.alias,
+                commandDescription,
                 label: stripIcons(editorAction.label) || editorAction.id,
             });
         }

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

@@ -19,6 +19,7 @@ import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storag
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 
 var AbstractCommandsQuickAccessProvider_1, CommandsHistory_1;
+const _moduleId = "vs/platform/quickinput/browser/commandsQuickAccess";
 let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvider extends PickerQuickAccessProvider {
     static { AbstractCommandsQuickAccessProvider_1 = this; }
     static { this.PREFIX = '>'; }
@@ -41,11 +42,11 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
             return [];
         }
         const runTfidf = createSingleCallFunction(() => {
-            const tfidf = ( new TfIdfCalculator());
-            tfidf.updateDocuments(( allCommandPicks.map(commandPick => ({
+            const tfidf = ( (new TfIdfCalculator()));
+            tfidf.updateDocuments(( (allCommandPicks.map(commandPick => ({
                 key: commandPick.commandId,
                 textChunks: [this.getTfIdfChunk(commandPick)]
-            }))));
+            })))));
             const result = tfidf.calculateScores(filter, token);
             return normalizeTfIdfScores(result)
                 .filter(score => score.score > AbstractCommandsQuickAccessProvider_1.TFIDF_THRESHOLD)
@@ -77,7 +78,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 }
             }
         }
-        const mapLabelToCommand = ( new Map());
+        const mapLabelToCommand = ( (new Map()));
         for (const commandPick of filteredCommandPicks) {
             const existingCommandForLabel = mapLabelToCommand.get(commandPick.label);
             if (existingCommandForLabel) {
@@ -113,8 +114,8 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 return 1;
             }
             if (this.options.suggestedCommandIds) {
-                const commandASuggestion = ( this.options.suggestedCommandIds.has(commandPickA.commandId));
-                const commandBSuggestion = ( this.options.suggestedCommandIds.has(commandPickB.commandId));
+                const commandASuggestion = ( (this.options.suggestedCommandIds.has(commandPickA.commandId)));
+                const commandBSuggestion = ( (this.options.suggestedCommandIds.has(commandPickB.commandId)));
                 if (commandASuggestion && commandBSuggestion) {
                     return 0;
                 }
@@ -134,36 +135,20 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
         for (let i = 0; i < filteredCommandPicks.length; i++) {
             const commandPick = filteredCommandPicks[i];
             if (i === 0 && this.commandsHistory.peek(commandPick.commandId)) {
-                commandPicks.push({ type: 'separator', label: ( localizeWithPath(
-                    'vs/platform/quickinput/browser/commandsQuickAccess',
-                    'recentlyUsed',
-                    "recently used"
-                )) });
+                commandPicks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 0, "recently used")) });
                 addOtherSeparator = true;
             }
             if (addSuggestedSeparator && commandPick.tfIdfScore !== undefined) {
-                commandPicks.push({ type: 'separator', label: ( localizeWithPath(
-                    'vs/platform/quickinput/browser/commandsQuickAccess',
-                    'suggested',
-                    "similar commands"
-                )) });
+                commandPicks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 1, "similar commands")) });
                 addSuggestedSeparator = false;
             }
             if (addCommonlyUsedSeparator && commandPick.tfIdfScore === undefined && !this.commandsHistory.peek(commandPick.commandId) && this.options.suggestedCommandIds?.has(commandPick.commandId)) {
-                commandPicks.push({ type: 'separator', label: ( localizeWithPath(
-                    'vs/platform/quickinput/browser/commandsQuickAccess',
-                    'commonlyUsed',
-                    "commonly used"
-                )) });
+                commandPicks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 2, "commonly used")) });
                 addOtherSeparator = true;
                 addCommonlyUsedSeparator = false;
             }
             if (addOtherSeparator && commandPick.tfIdfScore === undefined && !this.commandsHistory.peek(commandPick.commandId) && !this.options.suggestedCommandIds?.has(commandPick.commandId)) {
-                commandPicks.push({ type: 'separator', label: ( localizeWithPath(
-                    'vs/platform/quickinput/browser/commandsQuickAccess',
-                    'morecCommands',
-                    "other commands"
-                )) });
+                commandPicks.push({ type: 'separator', label: ( localizeWithPath(_moduleId, 3, "other commands")) });
                 addOtherSeparator = false;
             }
             commandPicks.push(this.toCommandPick(commandPick, runOptions));
@@ -178,13 +163,9 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 if (token.isCancellationRequested) {
                     return [];
                 }
-                const commandPicks = ( additionalCommandPicks.map(commandPick => this.toCommandPick(commandPick, runOptions)));
+                const commandPicks = ( (additionalCommandPicks.map(commandPick => this.toCommandPick(commandPick, runOptions))));
                 if (addSuggestedSeparator && commandPicks[0]?.type !== 'separator') {
-                    commandPicks.unshift({ type: 'separator', label: ( localizeWithPath(
-                        'vs/platform/quickinput/browser/commandsQuickAccess',
-                        'suggested',
-                        "similar commands"
-                    )) });
+                    commandPicks.unshift({ type: 'separator', label: ( localizeWithPath(_moduleId, 1, "similar commands")) });
                 }
                 return commandPicks;
             })()
@@ -196,13 +177,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
         }
         const keybinding = this.keybindingService.lookupKeybinding(commandPick.commandId);
         const ariaLabel = keybinding ?
-            ( localizeWithPath(
-                'vs/platform/quickinput/browser/commandsQuickAccess',
-                'commandPickAriaLabelWithKeybinding',
-                "{0}, {1}",
-                commandPick.label,
-                keybinding.getAriaLabel()
-            )) :
+            ( localizeWithPath(_moduleId, 4, "{0}, {1}", commandPick.label, keybinding.getAriaLabel())) :
             commandPick.label;
         return {
             ...commandPick,
@@ -222,12 +197,7 @@ let AbstractCommandsQuickAccessProvider = class AbstractCommandsQuickAccessProvi
                 }
                 catch (error) {
                     if (!isCancellationError(error)) {
-                        this.dialogService.error(( localizeWithPath(
-                            'vs/platform/quickinput/browser/commandsQuickAccess',
-                            'canNotRun',
-                            "Command '{0}' resulted in an error",
-                            commandPick.label
-                        )), toErrorMessage(error));
+                        this.dialogService.error(( localizeWithPath(_moduleId, 5, "Command '{0}' resulted in an error", commandPick.label)), toErrorMessage(error));
                     }
                 }
             }
@@ -244,13 +214,13 @@ 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; }
@@ -297,7 +267,7 @@ let CommandsHistory = class CommandsHistory extends Disposable {
                 this.logService.error(`[CommandsHistory] invalid data: ${error}`);
             }
         }
-        const cache = CommandsHistory_1.cache = ( new LRUCache(this.configuredCommandsHistoryLength, 1));
+        const cache = CommandsHistory_1.cache = ( (new LRUCache(this.configuredCommandsHistoryLength, 1)));
         if (serializedCache) {
             let entries;
             if (serializedCache.usesLRU) {
@@ -343,15 +313,15 @@ let CommandsHistory = class CommandsHistory extends Disposable {
     }
     static clearHistory(configurationService, storageService) {
         const commandHistoryLength = CommandsHistory_1.getConfiguredCommandHistoryLength(configurationService);
-        CommandsHistory_1.cache = ( new LRUCache(commandHistoryLength));
+        CommandsHistory_1.cache = ( (new LRUCache(commandHistoryLength)));
         CommandsHistory_1.counter = 1;
         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.js

@@ -7,16 +7,17 @@ import { Extensions } from 'vscode/vscode/vs/platform/quickinput/common/quickAcc
 import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 
 var HelpQuickAccessProvider_1;
+const _moduleId = "vs/platform/quickinput/browser/helpQuickAccess";
 let HelpQuickAccessProvider = class HelpQuickAccessProvider {
     static { HelpQuickAccessProvider_1 = this; }
     static { this.PREFIX = '?'; }
     constructor(quickInputService, keybindingService) {
         this.quickInputService = quickInputService;
         this.keybindingService = keybindingService;
-        this.registry = ( Registry.as(Extensions.Quickaccess));
+        this.registry = ( (Registry.as(Extensions.Quickaccess)));
     }
     provide(picker) {
-        const disposables = ( new DisposableStore());
+        const disposables = ( (new DisposableStore()));
         disposables.add(picker.onDidAccept(() => {
             const [item] = picker.selectedItems;
             if (item) {
@@ -40,28 +41,24 @@ let HelpQuickAccessProvider = class HelpQuickAccessProvider {
         return providers;
     }
     createPicks(provider) {
-        return ( provider.helpEntries.map(helpEntry => {
-            const prefix = helpEntry.prefix || provider.prefix;
-            const label = prefix || '\u2026' ;
-            return {
-                prefix,
-                label,
-                keybinding: helpEntry.commandId ? this.keybindingService.lookupKeybinding(helpEntry.commandId) : undefined,
-                ariaLabel: ( localizeWithPath(
-                    'vs/platform/quickinput/browser/helpQuickAccess',
-                    'helpPickAriaLabel',
-                    "{0}, {1}",
+        return (
+             (provider.helpEntries.map(helpEntry => {
+                const prefix = helpEntry.prefix || provider.prefix;
+                const label = prefix || '\u2026' ;
+                return {
+                    prefix,
                     label,
-                    helpEntry.description
-                )),
-                description: helpEntry.description
-            };
-        }));
+                    keybinding: helpEntry.commandId ? this.keybindingService.lookupKeybinding(helpEntry.commandId) : undefined,
+                    ariaLabel: ( localizeWithPath(_moduleId, 0, "{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)))
+], HelpQuickAccessProvider)));
 
 export { HelpQuickAccessProvider };

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

@@ -8,6 +8,7 @@ import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/comm
 import { inQuickPickContext, getQuickNavigateHandler, defaultQuickAccessContext } from 'vscode/vscode/vs/workbench/browser/quickaccess';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 
+const _moduleId = "vs/workbench/browser/actions/quickAccessActions";
 const globalQuickAccessKeybinding = {
     primary: 2048  | 46 ,
     secondary: [2048  | 35 ],
@@ -103,11 +104,7 @@ registerAction2(class QuickAccessAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.quickOpen',
-            title: ( localize2WithPath(
-                'vs/workbench/browser/actions/quickAccessActions',
-                'quickOpen',
-                "Go to File..."
-            )),
+            title: ( localize2WithPath(_moduleId, 0, "Go to File...")),
             metadata: {
                 description: `Quick access`,
                 args: [{
@@ -135,11 +132,7 @@ registerAction2(class QuickAccessAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.quickOpenWithModes',
-            title: ( localizeWithPath(
-                'vs/workbench/browser/actions/quickAccessActions',
-                'quickOpenWithModes',
-                "Quick Open"
-            )),
+            title: ( localizeWithPath(_moduleId, 1, "Quick Open")),
             icon: Codicon.search,
             menu: {
                 id: MenuId.CommandCenterCenter,
@@ -179,29 +172,17 @@ class BaseQuickAccessNavigateAction extends Action2 {
 }
 class QuickAccessNavigateNextAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenNavigateNext', ( localize2WithPath(
-            'vs/workbench/browser/actions/quickAccessActions',
-            'quickNavigateNext',
-            'Navigate Next in Quick Open'
-        )), true, true);
+        super('workbench.action.quickOpenNavigateNext', ( localize2WithPath(_moduleId, 2, 'Navigate Next in Quick Open')), true, true);
     }
 }
 class QuickAccessNavigatePreviousAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenNavigatePrevious', ( localize2WithPath(
-            'vs/workbench/browser/actions/quickAccessActions',
-            'quickNavigatePrevious',
-            'Navigate Previous in Quick Open'
-        )), false, true);
+        super('workbench.action.quickOpenNavigatePrevious', ( localize2WithPath(_moduleId, 3, 'Navigate Previous in Quick Open')), false, true);
     }
 }
 class QuickAccessSelectNextAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenSelectNext', ( localize2WithPath(
-            'vs/workbench/browser/actions/quickAccessActions',
-            'quickSelectNext',
-            'Select Next in Quick Open'
-        )), true, false, {
+        super('workbench.action.quickOpenSelectNext', ( localize2WithPath(_moduleId, 4, 'Select Next in Quick Open')), true, false, {
             weight: 200  + 50,
             when: inQuickPickContext,
             primary: 0,
@@ -211,11 +192,7 @@ class QuickAccessSelectNextAction extends BaseQuickAccessNavigateAction {
 }
 class QuickAccessSelectPreviousAction extends BaseQuickAccessNavigateAction {
     constructor() {
-        super('workbench.action.quickOpenSelectPrevious', ( localize2WithPath(
-            'vs/workbench/browser/actions/quickAccessActions',
-            'quickSelectPrevious',
-            'Select Previous in Quick Open'
-        )), false, false, {
+        super('workbench.action.quickOpenSelectPrevious', ( localize2WithPath(_moduleId, 5, 'Select Previous in Quick Open')), false, false, {
             weight: 200  + 50,
             when: inQuickPickContext,
             primary: 0,

package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.js

@@ -9,6 +9,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
 import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 
+const _moduleId = "vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess";
 let GotoLineQuickAccessProvider = class GotoLineQuickAccessProvider extends AbstractGotoLineQuickAccessProvider {
     constructor(editorService, editorGroupService, configurationService) {
         super();
@@ -41,21 +42,17 @@ let GotoLineQuickAccessProvider = class GotoLineQuickAccessProvider extends Abst
         }
     }
 };
-GotoLineQuickAccessProvider = ( __decorate([
-    ( __param(0, IEditorService)),
-    ( __param(1, IEditorGroupsService)),
-    ( __param(2, IConfigurationService))
-], GotoLineQuickAccessProvider));
+GotoLineQuickAccessProvider = ( (__decorate([
+    ( (__param(0, IEditorService))),
+    ( (__param(1, IEditorGroupsService))),
+    ( (__param(2, IConfigurationService)))
+], GotoLineQuickAccessProvider)));
 class GotoLineAction extends Action2 {
     static { this.ID = 'workbench.action.gotoLine'; }
     constructor() {
         super({
             id: GotoLineAction.ID,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess',
-                'gotoLine',
-                'Go to Line/Column...'
-            )),
+            title: ( localize2WithPath(_moduleId, 0, 'Go to Line/Column...')),
             f1: true,
             keybinding: {
                 weight: 200 ,
@@ -70,19 +67,15 @@ class GotoLineAction extends Action2 {
     }
 }
 registerAction2(GotoLineAction);
-( Registry.as(Extensions.Quickaccess)).registerQuickAccessProvider({
+( (Registry.as(Extensions.Quickaccess))).registerQuickAccessProvider({
     ctor: GotoLineQuickAccessProvider,
     prefix: AbstractGotoLineQuickAccessProvider.PREFIX,
     placeholder: ( localizeWithPath(
-        'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess',
-        'gotoLineQuickAccessPlaceholder',
+        _moduleId,
+        1,
         "Type the line number and optional column to go to (e.g. 42:5 for line 42 and column 5)."
     )),
-    helpEntries: [{ description: ( localizeWithPath(
-        'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess',
-        'gotoLineQuickAccess',
-        "Go to Line/Column"
-    )), commandId: GotoLineAction.ID }]
+    helpEntries: [{ description: ( localizeWithPath(_moduleId, 2, "Go to Line/Column")), commandId: GotoLineAction.ID }]
 });
 
 export { GotoLineQuickAccessProvider };

package/vscode/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js

@@ -31,9 +31,11 @@ import { IAiRelatedInformationService } from 'vscode/vscode/vs/workbench/service
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { createKeybindingCommandQuery } from 'vscode/vscode/vs/workbench/services/preferences/browser/keybindingsEditorModel';
 import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences.service';
 
 var CommandsQuickAccessProvider_1;
+const _moduleId = "vs/workbench/contrib/quickaccess/browser/commandsQuickAccess";
 let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends AbstractEditorCommandsQuickAccessProvider {
     static { CommandsQuickAccessProvider_1 = this; }
     static { this.AI_RELATED_INFORMATION_MAX_PICKS = 5; }
@@ -50,11 +52,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         super({
             showAlias: !Language.isDefaultVariant(),
             noResultsPick: () => ({
-                label: ( localizeWithPath(
-                    'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess',
-                    'noCommandResults',
-                    "No matching commands"
-                )),
+                label: ( localizeWithPath(_moduleId, 0, "No matching commands")),
                 commandId: ''
             }),
         }, instantiationService, keybindingService, commandService, telemetryService, dialogService);
@@ -85,7 +83,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         }
         const config = this.configuration;
         const suggestedCommandIds = config.experimental.suggestCommands && this.productService.commandPaletteSuggestedCommandIds?.length
-            ? ( new Set(this.productService.commandPaletteSuggestedCommandIds))
+            ? ( (new Set(this.productService.commandPaletteSuggestedCommandIds)))
             : undefined;
         this.options.suggestedCommandIds = suggestedCommandIds;
         this.useAiRelatedInfo = config.experimental.enableNaturalLanguageSearch;
@@ -95,24 +93,22 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         if (token.isCancellationRequested) {
             return [];
         }
-        return ( [
-            ...this.getCodeEditorCommandPicks(),
-            ...this.getGlobalCommandPicks()
-        ].map(picks => ({
-            ...picks,
-            buttons: [{
-                    iconClass: ThemeIcon.asClassName(Codicon.gear),
-                    tooltip: ( localizeWithPath(
-                        'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess',
-                        'configure keybinding',
-                        "Configure Keybinding"
-                    )),
-                }],
-            trigger: () => {
-                this.preferencesService.openGlobalKeybindingSettings(false, { query: `@command:${picks.commandId}` });
-                return TriggerAction.CLOSE_PICKER;
-            },
-        })));
+        return (
+             ([
+                ...this.getCodeEditorCommandPicks(),
+                ...this.getGlobalCommandPicks()
+            ].map(picks => ({
+                ...picks,
+                buttons: [{
+                        iconClass: ThemeIcon.asClassName(Codicon.gear),
+                        tooltip: ( localizeWithPath(_moduleId, 1, "Configure Keybinding")),
+                    }],
+                trigger: () => {
+                    this.preferencesService.openGlobalKeybindingSettings(false, { query: createKeybindingCommandQuery(picks.commandId, picks.commandWhen) });
+                    return TriggerAction.CLOSE_PICKER;
+                },
+            })))
+        );
     }
     hasAdditionalCommandPicks(filter, token) {
         if (!this.useAiRelatedInfo
@@ -143,13 +139,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         const defaultAgent = this.chatAgentService.getDefaultAgent(ChatAgentLocation.Panel);
         if (defaultAgent) {
             additionalPicks.push({
-                label: ( localizeWithPath(
-                    'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess',
-                    'askXInChat',
-                    "Ask {0}: {1}",
-                    defaultAgent.metadata.fullName,
-                    filter
-                )),
+                label: ( localizeWithPath(_moduleId, 2, "Ask {0}: {1}", defaultAgent.metadata.fullName, filter)),
                 commandId: this.configuration.experimental.askChatLocation === 'quickChat' ? ASK_QUICK_QUESTION_ACTION_ID : CHAT_OPEN_ACTION_ID,
                 args: [filter]
             });
@@ -159,13 +149,13 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
     async getRelatedInformationPicks(allPicks, picksSoFar, filter, token) {
         const relatedInformation = await this.aiRelatedInformationService.getRelatedInformation(filter, [RelatedInformationType.CommandInformation], token);
         relatedInformation.sort((a, b) => b.weight - a.weight);
-        const setOfPicksSoFar = ( new Set(( picksSoFar.map(p => p.commandId))));
-        const additionalPicks = ( new Array());
+        const setOfPicksSoFar = ( (new Set( (picksSoFar.map(p => p.commandId)))));
+        const additionalPicks = ( (new Array()));
         for (const info of relatedInformation) {
             if (info.weight < CommandsQuickAccessProvider_1.AI_RELATED_INFORMATION_THRESHOLD || additionalPicks.length === CommandsQuickAccessProvider_1.AI_RELATED_INFORMATION_MAX_PICKS) {
                 break;
             }
-            const pick = allPicks.find(p => p.commandId === info.command && !( setOfPicksSoFar.has(p.commandId)));
+            const pick = allPicks.find(p => p.commandId === info.command && !( (setOfPicksSoFar.has(p.commandId))));
             if (pick) {
                 additionalPicks.push(pick);
             }
@@ -183,13 +173,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
             let label = (typeof action.item.title === 'string' ? action.item.title : action.item.title.value) || action.item.id;
             const category = typeof action.item.category === 'string' ? action.item.category : action.item.category?.value;
             if (category) {
-                label = ( localizeWithPath(
-                    'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess',
-                    'commandWithCategory',
-                    "{0}: {1}",
-                    category,
-                    label
-                ));
+                label = ( localizeWithPath(_moduleId, 3, "{0}: {1}", category, label));
             }
             const aliasLabel = typeof action.item.title !== 'string' ? action.item.title.original : undefined;
             const aliasCategory = (category && action.item.category && typeof action.item.category !== 'string') ? action.item.category.original : undefined;
@@ -202,6 +186,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
                 : { value: metadataDescription, original: metadataDescription };
             globalCommandPicks.push({
                 commandId: action.item.id,
+                commandWhen: action.item.precondition?.serialize(),
                 commandAlias,
                 label: stripIcons(label),
                 commandDescription,
@@ -211,32 +196,28 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
         return globalCommandPicks;
     }
 };
-CommandsQuickAccessProvider = CommandsQuickAccessProvider_1 = ( __decorate([
-    ( __param(0, IEditorService)),
-    ( __param(1, IMenuService)),
-    ( __param(2, IExtensionService)),
-    ( __param(3, IInstantiationService)),
-    ( __param(4, IKeybindingService)),
-    ( __param(5, ICommandService)),
-    ( __param(6, ITelemetryService)),
-    ( __param(7, IDialogService)),
-    ( __param(8, IConfigurationService)),
-    ( __param(9, IEditorGroupsService)),
-    ( __param(10, IPreferencesService)),
-    ( __param(11, IProductService)),
-    ( __param(12, IAiRelatedInformationService)),
-    ( __param(13, IChatAgentService))
-], CommandsQuickAccessProvider));
+CommandsQuickAccessProvider = CommandsQuickAccessProvider_1 = ( (__decorate([
+    ( (__param(0, IEditorService))),
+    ( (__param(1, IMenuService))),
+    ( (__param(2, IExtensionService))),
+    ( (__param(3, IInstantiationService))),
+    ( (__param(4, IKeybindingService))),
+    ( (__param(5, ICommandService))),
+    ( (__param(6, ITelemetryService))),
+    ( (__param(7, IDialogService))),
+    ( (__param(8, IConfigurationService))),
+    ( (__param(9, IEditorGroupsService))),
+    ( (__param(10, IPreferencesService))),
+    ( (__param(11, IProductService))),
+    ( (__param(12, IAiRelatedInformationService))),
+    ( (__param(13, IChatAgentService)))
+], CommandsQuickAccessProvider)));
 class ShowAllCommandsAction extends Action2 {
     static { this.ID = 'workbench.action.showCommands'; }
     constructor() {
         super({
             id: ShowAllCommandsAction.ID,
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess',
-                'showTriggerActions',
-                'Show All Commands'
-            )),
+            title: ( localize2WithPath(_moduleId, 4, 'Show All Commands')),
             keybinding: {
                 weight: 200 ,
                 when: undefined,
@@ -254,11 +235,7 @@ class ClearCommandHistoryAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.clearCommandHistory',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess',
-                'clearCommandHistory',
-                'Clear Command History'
-            )),
+            title: ( localize2WithPath(_moduleId, 5, 'Clear Command History')),
             f1: true
         });
     }
@@ -271,20 +248,12 @@ class ClearCommandHistoryAction extends Action2 {
             const { confirmed } = await dialogService.confirm({
                 type: 'warning',
                 message: ( localizeWithPath(
-                    'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess',
-                    'confirmClearMessage',
+                    _moduleId,
+                    6,
                     "Do you want to clear the history of recently used commands?"
                 )),
-                detail: ( localizeWithPath(
-                    'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess',
-                    'confirmClearDetail',
-                    "This action is irreversible!"
-                )),
-                primaryButton: ( localizeWithPath(
-                    'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess',
-                    { key: 'clearButtonLabel', comment: ['&& denotes a mnemonic'] },
-                    "&&Clear"
-                ))
+                detail: ( localizeWithPath(_moduleId, 7, "This action is irreversible!")),
+                primaryButton: ( localizeWithPath(_moduleId, 8, "&&Clear"))
             });
             if (!confirmed) {
                 return;