@codingame/monaco-vscode-keybindings-service-override 22.1.9 → 23.0.1

package/vscode/src/vs/workbench/services/commands/common/commandService.d.ts

@@ -18,7 +18,7 @@ export declare class CommandService extends Disposable implements ICommandServic
     readonly onDidExecuteCommand: Event<ICommandEvent>;
     constructor(_instantiationService: IInstantiationService, _extensionService: IExtensionService, _logService: ILogService);
     private _activateStar;
-    executeCommand<T>(id: string, ...args: any[]): Promise<T>;
+    executeCommand<T>(id: string, ...args: unknown[]): Promise<T>;
     private _tryExecuteCommand;
     dispose(): void;
 }

package/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.js

@@ -50,39 +50,39 @@ import { getAllUnboundCommands } from '@codingame/monaco-vscode-d609a7d3-bf87-55
 var WorkbenchKeybindingService_1;
 function isValidContributedKeyBinding(keyBinding, rejects) {
     if (!keyBinding) {
-        rejects.push(( localize(13599, "expected non-empty value.")));
+        rejects.push(( localize(13897, "expected non-empty value.")));
         return false;
     }
     if (typeof keyBinding.command !== 'string') {
         rejects.push(( localize(
-            13600,
+            13898,
             "property `{0}` is mandatory and must be of type `string`",
             'command'
         )));
         return false;
     }
     if (keyBinding.key && typeof keyBinding.key !== 'string') {
-        rejects.push(( localize(13601, "property `{0}` can be omitted or must be of type `string`", 'key')));
+        rejects.push(( localize(13899, "property `{0}` can be omitted or must be of type `string`", 'key')));
         return false;
     }
     if (keyBinding.when && typeof keyBinding.when !== 'string') {
-        rejects.push(( localize(13601, "property `{0}` can be omitted or must be of type `string`", 'when')));
+        rejects.push(( localize(13899, "property `{0}` can be omitted or must be of type `string`", 'when')));
         return false;
     }
     if (keyBinding.mac && typeof keyBinding.mac !== 'string') {
-        rejects.push(( localize(13601, "property `{0}` can be omitted or must be of type `string`", 'mac')));
+        rejects.push(( localize(13899, "property `{0}` can be omitted or must be of type `string`", 'mac')));
         return false;
     }
     if (keyBinding.linux && typeof keyBinding.linux !== 'string') {
         rejects.push(( localize(
-            13601,
+            13899,
             "property `{0}` can be omitted or must be of type `string`",
             'linux'
         )));
         return false;
     }
     if (keyBinding.win && typeof keyBinding.win !== 'string') {
-        rejects.push(( localize(13601, "property `{0}` can be omitted or must be of type `string`", 'win')));
+        rejects.push(( localize(13899, "property `{0}` can be omitted or must be of type `string`", 'win')));
         return false;
     }
     return true;
@@ -90,35 +90,36 @@ function isValidContributedKeyBinding(keyBinding, rejects) {
 const keybindingType = {
     type: 'object',
     default: { command: '', key: '' },
+    required: ['command', 'key'],
     properties: {
         command: {
-            description: ( localize(13602, 'Identifier of the command to run when keybinding is triggered.')),
+            description: ( localize(13900, 'Identifier of the command to run when keybinding is triggered.')),
             type: 'string'
         },
         args: {
-            description: ( localize(13603, "Arguments to pass to the command to execute."))
+            description: ( localize(13901, "Arguments to pass to the command to execute."))
         },
         key: {
             description: ( localize(
-                13604,
+                13902,
                 'Key or key sequence (separate keys with plus-sign and sequences with space, e.g. Ctrl+O and Ctrl+L L for a chord).'
             )),
             type: 'string'
         },
         mac: {
-            description: ( localize(13605, 'Mac specific key or key sequence.')),
+            description: ( localize(13903, 'Mac specific key or key sequence.')),
             type: 'string'
         },
         linux: {
-            description: ( localize(13606, 'Linux specific key or key sequence.')),
+            description: ( localize(13904, 'Linux specific key or key sequence.')),
             type: 'string'
         },
         win: {
-            description: ( localize(13607, 'Windows specific key or key sequence.')),
+            description: ( localize(13905, 'Windows specific key or key sequence.')),
             type: 'string'
         },
         when: {
-            description: ( localize(13608, 'Condition when the key is active.')),
+            description: ( localize(13906, 'Condition when the key is active.')),
             type: 'string'
         },
     }
@@ -127,7 +128,7 @@ const keybindingsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'keybindings',
     deps: [commandsExtensionPoint],
     jsonSchema: {
-        description: ( localize(13609, "Contributes keybindings.")),
+        description: ( localize(13907, "Contributes keybindings.")),
         oneOf: [
             keybindingType,
             {
@@ -515,7 +516,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         }
         if (rejects.length > 0) {
             collector.error(( localize(
-                13610,
+                13908,
                 "Invalid `contributes.{0}`: {1}",
                 keybindingsExtPoint.name,
                 rejects.join('\n')
@@ -603,7 +604,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
     static _getAllCommandsAsComment(boundCommands) {
         const unboundCommands = getAllUnboundCommands(boundCommands);
         const pretty = unboundCommands.sort().join('\n// - ');
-        return '// ' + ( localize(13611, "Here are other available commands: ")) + '\n// - ' + pretty;
+        return '// ' + ( localize(13909, "Here are other available commands: ")) + '\n// - ' + pretty;
     }
     mightProducePrintableCharacter(event) {
         if (event.ctrlKey || event.metaKey || event.altKey) {
@@ -728,7 +729,7 @@ class KeybindingsJsonSchema {
         this.schema = {
             id: KeybindingsJsonSchema.schemaId,
             type: 'array',
-            title: ( localize(13612, "Keybindings configuration")),
+            title: ( localize(13910, "Keybindings configuration")),
             allowTrailingCommas: true,
             allowComments: true,
             definitions: {
@@ -752,7 +753,7 @@ class KeybindingsJsonSchema {
                     'type': 'string',
                     'enum': this.commandsEnum,
                     'enumDescriptions': this.commandsEnumDescriptions,
-                    'description': ( localize(13613, "Name of the command to execute")),
+                    'description': ( localize(13911, "Name of the command to execute")),
                 },
                 'commandType': {
                     'anyOf': [
@@ -763,7 +764,7 @@ class KeybindingsJsonSchema {
                             'type': 'string',
                             'enum': this.removalCommandsEnum,
                             'enumDescriptions': this.commandsEnumDescriptions,
-                            'description': ( localize(13614, "Name of the command to remove keyboard shortcut for")),
+                            'description': ( localize(13912, "Name of the command to remove keyboard shortcut for")),
                         },
                         {
                             'type': 'string'
@@ -781,7 +782,7 @@ class KeybindingsJsonSchema {
                 'properties': {
                     'key': {
                         'type': 'string',
-                        'description': ( localize(13615, "Key or key sequence (separated by space)")),
+                        'description': ( localize(13913, "Key or key sequence (separated by space)")),
                     },
                     'command': {
                         'anyOf': [
@@ -794,7 +795,7 @@ class KeybindingsJsonSchema {
                                         'type': 'array'
                                     },
                                     'errorMessage': ( localize(
-                                        13616,
+                                        13914,
                                         "Incorrect type. Expected \"{0}\". The field 'command' does not support running multiple commands. Use command 'runCommands' to pass it multiple commands to run.",
                                         'string'
                                     ))
@@ -810,10 +811,10 @@ class KeybindingsJsonSchema {
                     },
                     'when': {
                         'type': 'string',
-                        'description': ( localize(13617, "Condition when the key is active."))
+                        'description': ( localize(13915, "Condition when the key is active."))
                     },
                     'args': {
-                        'description': ( localize(13618, "Arguments to pass to the command to execute."))
+                        'description': ( localize(13916, "Arguments to pass to the command to execute."))
                     }
                 },
                 '$ref': '#/definitions/commandsSchemas'
@@ -833,7 +834,9 @@ class KeybindingsJsonSchema {
                 if (!( knownCommands.has(commandId))) {
                     knownCommands.add(commandId);
                     this.commandsEnum.push(commandId);
-                    this.commandsEnumDescriptions.push(isLocalizedString(description) ? description.value : description);
+                    this.commandsEnumDescriptions.push(description === undefined
+                        ? ''
+                        : (isLocalizedString(description) ? description.value : description));
                     this.removalCommandsEnum.push(`-${commandId}`);
                 }
             }

package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.js

@@ -483,12 +483,12 @@ const keyboardConfiguration = {
     'id': 'keyboard',
     'order': 15,
     'type': 'object',
-    'title': ( localize(13619, "Keyboard")),
+    'title': ( localize(13917, "Keyboard")),
     'properties': {
         'keyboard.layout': {
             'type': 'string',
             'default': 'autodetect',
-            'description': ( localize(13620, "Control the keyboard layout used in web."))
+            'description': ( localize(13918, "Control the keyboard layout used in web."))
         }
     }
 };