@codingame/monaco-vscode-api 4.5.1 → 5.0.0

package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.js

@@ -13,26 +13,23 @@ import { getAllUnboundCommands } from '../../keybinding/browser/unboundCommands.
 import { isString, isEmptyObject } from '../../../../base/common/types.js';
 import { IExtensionService } from '../../extensions/common/extensions.service.js';
 import { ExtensionIdentifier, ExtensionIdentifierMap } from '../../../../platform/extensions/common/extensions.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 var KeybindingsEditorModel_1;
+const _moduleId = "vs/workbench/services/preferences/browser/keybindingsEditorModel";
 const KEYBINDING_ENTRY_TEMPLATE_ID = 'keybinding.entry.template';
-const SOURCE_SYSTEM = ( localizeWithPath(
-    'vs/workbench/services/preferences/browser/keybindingsEditorModel',
-    'default',
-    "System"
-));
-const SOURCE_EXTENSION = ( localizeWithPath(
-    'vs/workbench/services/preferences/browser/keybindingsEditorModel',
-    'extension',
-    "Extension"
-));
-const SOURCE_USER = ( localizeWithPath(
-    'vs/workbench/services/preferences/browser/keybindingsEditorModel',
-    'user',
-    "User"
-));
+const SOURCE_SYSTEM = ( localizeWithPath(_moduleId, 0, "System"));
+const SOURCE_EXTENSION = ( localizeWithPath(_moduleId, 1, "Extension"));
+const SOURCE_USER = ( localizeWithPath(_moduleId, 2, "User"));
+function createKeybindingCommandQuery(commandId, when) {
+    const whenPart = when ? ` +when:${when}` : '';
+    return `@command:${commandId}${whenPart}`;
+}
 const wordFilter = or(matchesPrefix, matchesWords, matchesContiguousSubString);
+const COMMAND_REGEX = /@command:\s*([^\+]+)/i;
+const WHEN_REGEX = /\+when:\s*(.+)/i;
 const SOURCE_REGEX = /@source:\s*(user|default|system|extension)/i;
 const EXTENSION_REGEX = /@ext:\s*((".+")|([^\s]+))/i;
+const KEYBINDING_REGEX = /@keybinding:\s*((\".+\")|(\S+))/i;
 let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorModel extends EditorModel {
     constructor(os, keybindingsService, extensionService) {
         super();
@@ -48,12 +45,22 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
     }
     fetch(searchValue, sortByPrecedence = false) {
         let keybindingItems = sortByPrecedence ? this._keybindingItemsSortedByPrecedence : this._keybindingItems;
-        const commandIdMatches = /@command:\s*(.+)/i.exec(searchValue);
+        const commandIdMatches = COMMAND_REGEX.exec(searchValue);
         if (commandIdMatches && commandIdMatches[1]) {
-            return ( keybindingItems.filter(k => k.command === commandIdMatches[1])
-                .map(
-                keybindingItem => ({ id: KeybindingsEditorModel_1.getId(keybindingItem), keybindingItem, templateId: KEYBINDING_ENTRY_TEMPLATE_ID })
-            ));
+            const command = commandIdMatches[1].trim();
+            let filteredKeybindingItems = keybindingItems.filter(k => k.command === command);
+            if (filteredKeybindingItems.length) {
+                const whenMatches = WHEN_REGEX.exec(searchValue);
+                if (whenMatches && whenMatches[1]) {
+                    const whenValue = whenMatches[1].trim();
+                    filteredKeybindingItems = this.filterByWhen(filteredKeybindingItems, command, whenValue);
+                }
+            }
+            return (
+                 (filteredKeybindingItems.map(
+                    keybindingItem => ({ id: KeybindingsEditorModel_1.getId(keybindingItem), keybindingItem, templateId: KEYBINDING_ENTRY_TEMPLATE_ID })
+                ))
+            );
         }
         if (SOURCE_REGEX.test(searchValue)) {
             keybindingItems = this.filterBySource(keybindingItems, searchValue);
@@ -67,7 +74,7 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
                 searchValue = searchValue.replace(EXTENSION_REGEX, '');
             }
             else {
-                const keybindingMatches = /@keybinding:\s*((\".+\")|(\S+))/i.exec(searchValue);
+                const keybindingMatches = KEYBINDING_REGEX.exec(searchValue);
                 if (keybindingMatches && (keybindingMatches[2] || keybindingMatches[3])) {
                     searchValue = keybindingMatches[2] || `"${keybindingMatches[3]}"`;
                 }
@@ -75,9 +82,11 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         }
         searchValue = searchValue.trim();
         if (!searchValue) {
-            return ( keybindingItems.map(
-                keybindingItem => ({ id: KeybindingsEditorModel_1.getId(keybindingItem), keybindingItem, templateId: KEYBINDING_ENTRY_TEMPLATE_ID })
-            ));
+            return (
+                 (keybindingItems.map(
+                    keybindingItem => ({ id: KeybindingsEditorModel_1.getId(keybindingItem), keybindingItem, templateId: KEYBINDING_ENTRY_TEMPLATE_ID })
+                ))
+            );
         }
         return this.filterByText(keybindingItems, searchValue);
     }
@@ -112,14 +121,14 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         const words = searchValue.split(' ');
         const keybindingWords = this.splitKeybindingWords(words);
         for (const keybindingItem of keybindingItems) {
-            const keybindingMatches = ( new KeybindingItemMatches(
+            const keybindingMatches = ( (new KeybindingItemMatches(
                 this.modifierLabels,
                 keybindingItem,
                 searchValue,
                 words,
                 keybindingWords,
                 completeMatch
-            ));
+            )));
             if (keybindingMatches.commandIdMatches
                 || keybindingMatches.commandLabelMatches
                 || keybindingMatches.commandDefaultLabelMatches
@@ -145,6 +154,27 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         }
         return result;
     }
+    filterByWhen(keybindingItems, command, when) {
+        if (keybindingItems.length === 0) {
+            return [];
+        }
+        const keybindingItemsWithWhen = keybindingItems.filter(k => k.when === when);
+        if (keybindingItemsWithWhen.length) {
+            return keybindingItemsWithWhen;
+        }
+        const commandLabel = keybindingItems[0].commandLabel;
+        const keybindingItem = ( (new ResolvedKeybindingItem(
+            undefined,
+            command,
+            null,
+            ContextKeyExpr.deserialize(when),
+            false,
+            null,
+            false
+        )));
+        const actionLabels = ( (new Map([[command, commandLabel]])));
+        return [KeybindingsEditorModel_1.toKeybindingEntry(command, keybindingItem, actionLabels, this.getExtensionsMapping())];
+    }
     splitKeybindingWords(wordsSeparatedBySpaces) {
         const result = [];
         for (const word of wordsSeparatedBySpaces) {
@@ -152,22 +182,19 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         }
         return result;
     }
-    async resolve(actionLabels = ( new Map())) {
-        const extensions = ( new ExtensionIdentifierMap());
-        for (const extension of this.extensionService.extensions) {
-            extensions.set(extension.identifier, extension);
-        }
+    async resolve(actionLabels = ( (new Map()))) {
+        const extensions = this.getExtensionsMapping();
         this._keybindingItemsSortedByPrecedence = [];
-        const boundCommands = ( new Map());
+        const boundCommands = ( (new Map()));
         for (const keybinding of this.keybindingsService.getKeybindings()) {
             if (keybinding.command) {
                 this._keybindingItemsSortedByPrecedence.push(KeybindingsEditorModel_1.toKeybindingEntry(keybinding.command, keybinding, actionLabels, extensions));
                 boundCommands.set(keybinding.command, true);
             }
         }
-        const commandsWithDefaultKeybindings = ( this.keybindingsService.getDefaultKeybindings().map(keybinding => keybinding.command));
+        const commandsWithDefaultKeybindings = ( (this.keybindingsService.getDefaultKeybindings().map(keybinding => keybinding.command)));
         for (const command of getAllUnboundCommands(boundCommands)) {
-            const keybindingItem = ( new ResolvedKeybindingItem(
+            const keybindingItem = ( (new ResolvedKeybindingItem(
                 undefined,
                 command,
                 null,
@@ -175,7 +202,7 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
                 commandsWithDefaultKeybindings.indexOf(command) === -1,
                 null,
                 false
-            ));
+            )));
             this._keybindingItemsSortedByPrecedence.push(KeybindingsEditorModel_1.toKeybindingEntry(command, keybindingItem, actionLabels, extensions));
         }
         this._keybindingItemsSortedByPrecedence = distinct(this._keybindingItemsSortedByPrecedence, keybindingItem => KeybindingsEditorModel_1.getId(keybindingItem));
@@ -185,6 +212,13 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
     static getId(keybindingItem) {
         return keybindingItem.command + (keybindingItem?.keybinding?.getAriaLabel() ?? '') + keybindingItem.when + (isString(keybindingItem.source) ? keybindingItem.source : keybindingItem.source.identifier.value);
     }
+    getExtensionsMapping() {
+        const extensions = ( (new ExtensionIdentifierMap()));
+        for (const extension of this.extensionService.extensions) {
+            extensions.set(extension.identifier, extension);
+        }
+        return extensions;
+    }
     static compareKeybindingData(a, b) {
         if (a.keybinding && !b.keybinding) {
             return -1;
@@ -231,13 +265,7 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
             if (menuCommand && menuCommand.title && menuCommand.title.original) {
                 const category = menuCommand.category ? menuCommand.category.original : undefined;
                 const title = menuCommand.title.original;
-                return category ? ( localizeWithPath(
-                    'vs/workbench/services/preferences/browser/keybindingsEditorModel',
-                    'cat.title',
-                    "{0}: {1}",
-                    category,
-                    title
-                )) : title;
+                return category ? ( localizeWithPath(_moduleId, 3, "{0}: {1}", category, title)) : title;
             }
         }
         return null;
@@ -246,13 +274,7 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         if (menuCommand) {
             const category = menuCommand.category ? typeof menuCommand.category === 'string' ? menuCommand.category : menuCommand.category.value : undefined;
             const title = typeof menuCommand.title === 'string' ? menuCommand.title : menuCommand.title.value;
-            return category ? ( localizeWithPath(
-                'vs/workbench/services/preferences/browser/keybindingsEditorModel',
-                'cat.title',
-                "{0}: {1}",
-                category,
-                title
-            )) : title;
+            return category ? ( localizeWithPath(_moduleId, 3, "{0}: {1}", category, title)) : title;
         }
         if (editorActionLabel) {
             return editorActionLabel;
@@ -260,10 +282,10 @@ let KeybindingsEditorModel = KeybindingsEditorModel_1 = class KeybindingsEditorM
         return '';
     }
 };
-KeybindingsEditorModel = KeybindingsEditorModel_1 = ( __decorate([
-    ( __param(1, IKeybindingService)),
-    ( __param(2, IExtensionService))
-], KeybindingsEditorModel));
+KeybindingsEditorModel = KeybindingsEditorModel_1 = ( (__decorate([
+    ( (__param(1, IKeybindingService))),
+    ( (__param(2, IExtensionService)))
+], KeybindingsEditorModel)));
 class KeybindingItemMatches {
     constructor(modifierLabels, keybindingItem, searchValue, words, keybindingWords, completeMatch) {
         this.modifierLabels = modifierLabels;
@@ -314,9 +336,9 @@ class KeybindingItemMatches {
         return matches;
     }
     filterAndSort(matches) {
-        return distinct(matches, (a => a.start + '.' + a.end)).filter(match => !( matches.some(
+        return distinct(matches, (a => a.start + '.' + a.end)).filter(match => !( (matches.some(
             m => !(m.start === match.start && m.end === match.end) && (m.start <= match.start && m.end >= match.end)
-        ))).sort((a, b) => a.start - b.start);
+        )))).sort((a, b) => a.start - b.start);
     }
     matchesKeybinding(keybinding, searchValue, words, completeMatch) {
         const [firstPart, chordPart] = keybinding.getChords();
@@ -532,11 +554,7 @@ class KeybindingItemMatches {
         if (equalsIgnoreCase(this.modifierLabels.user.altKey, word)) {
             return true;
         }
-        if (equalsIgnoreCase(( localizeWithPath(
-            'vs/workbench/services/preferences/browser/keybindingsEditorModel',
-            'option',
-            "option"
-        )), word)) {
+        if (equalsIgnoreCase(( localizeWithPath(_moduleId, 4, "option")), word)) {
             return true;
         }
         return false;
@@ -563,11 +581,7 @@ class KeybindingItemMatches {
         if (equalsIgnoreCase(this.modifierLabels.user.metaKey, word)) {
             return true;
         }
-        if (equalsIgnoreCase(( localizeWithPath(
-            'vs/workbench/services/preferences/browser/keybindingsEditorModel',
-            'meta',
-            "meta"
-        )), word)) {
+        if (equalsIgnoreCase(( localizeWithPath(_moduleId, 5, "meta")), word)) {
             return true;
         }
         return false;
@@ -585,4 +599,4 @@ class KeybindingItemMatches {
         return false;
     }
 }
-export { KEYBINDING_ENTRY_TEMPLATE_ID, KeybindingsEditorModel };
+export { KEYBINDING_ENTRY_TEMPLATE_ID, KeybindingsEditorModel, createKeybindingCommandQuery };

package/vscode/src/vs/workbench/services/preferences/common/preferencesEditorInput.js

@@ -7,20 +7,17 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { EditorInput } from '../../../common/editor/editorInput.js';
 import { IPreferencesService } from './preferences.service.js';
 var SettingsEditor2Input_1;
-const SettingsEditorIcon = registerIcon('settings-editor-label-icon', Codicon.settings, ( localizeWithPath(
-    'vs/workbench/services/preferences/common/preferencesEditorInput',
-    'settingsEditorLabelIcon',
-    'Icon of the settings editor label.'
-)));
+const _moduleId = "vs/workbench/services/preferences/common/preferencesEditorInput";
+const SettingsEditorIcon = registerIcon('settings-editor-label-icon', Codicon.settings, ( localizeWithPath(_moduleId, 0, 'Icon of the settings editor label.')));
 let SettingsEditor2Input = class SettingsEditor2Input extends EditorInput {
     static { SettingsEditor2Input_1 = this; }
     static { this.ID = 'workbench.input.settings2'; }
     constructor(_preferencesService) {
         super();
-        this.resource = ( URI.from({
+        this.resource = ( (URI.from({
             scheme: Schemas.vscodeSettings,
             path: `settingseditor`
-        }));
+        })));
         this._settingsModel = _preferencesService.createSettings2EditorModel();
     }
     matches(otherInput) {
@@ -30,11 +27,7 @@ let SettingsEditor2Input = class SettingsEditor2Input extends EditorInput {
         return SettingsEditor2Input_1.ID;
     }
     getName() {
-        return ( localizeWithPath(
-            'vs/workbench/services/preferences/common/preferencesEditorInput',
-            'settingsEditor2InputName',
-            "Settings"
-        ));
+        return ( localizeWithPath(_moduleId, 1, "Settings"));
     }
     getIcon() {
         return SettingsEditorIcon;
@@ -47,7 +40,7 @@ let SettingsEditor2Input = class SettingsEditor2Input extends EditorInput {
         super.dispose();
     }
 };
-SettingsEditor2Input = SettingsEditor2Input_1 = ( __decorate([
-    ( __param(0, IPreferencesService))
-], SettingsEditor2Input));
+SettingsEditor2Input = SettingsEditor2Input_1 = ( (__decorate([
+    ( (__param(0, IPreferencesService)))
+], SettingsEditor2Input)));
 export { SettingsEditor2Input };