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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-quickaccess-service-override",
-  "version": "4.5.2",
+  "version": "5.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.5.2"
+    "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/workbench/contrib/quickaccess/browser/commandsQuickAccess.js

@@ -31,6 +31,7 @@ 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;
@@ -103,7 +104,7 @@ let CommandsQuickAccessProvider = class CommandsQuickAccessProvider extends Abst
                         tooltip: ( localizeWithPath(_moduleId, 1, "Configure Keybinding")),
                     }],
                 trigger: () => {
-                    this.preferencesService.openGlobalKeybindingSettings(false, { query: `@command:${picks.commandId}` });
+                    this.preferencesService.openGlobalKeybindingSettings(false, { query: createKeybindingCommandQuery(picks.commandId, picks.commandWhen) });
                     return TriggerAction.CLOSE_PICKER;
                 },
             })))
@@ -185,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,