@codingame/monaco-vscode-keybindings-service-override 33.0.7 → 34.0.0

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

@@ -51,39 +51,39 @@ import { EditorContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/editor
 var WorkbenchKeybindingService_1;
 function isValidContributedKeyBinding(keyBinding, rejects) {
     if (!keyBinding) {
-        rejects.push(( localize(16886, "expected non-empty value.")));
+        rejects.push(( localize(17101, "expected non-empty value.")));
         return false;
     }
     if (typeof keyBinding.command !== "string") {
         rejects.push(( localize(
-            16887,
+            17102,
             "property `{0}` is mandatory and must be of type `string`",
             "command"
         )));
         return false;
     }
     if (keyBinding.key && typeof keyBinding.key !== "string") {
-        rejects.push(( localize(16888, "property `{0}` can be omitted or must be of type `string`", "key")));
+        rejects.push(( localize(17103, "property `{0}` can be omitted or must be of type `string`", "key")));
         return false;
     }
     if (keyBinding.when && typeof keyBinding.when !== "string") {
-        rejects.push(( localize(16888, "property `{0}` can be omitted or must be of type `string`", "when")));
+        rejects.push(( localize(17103, "property `{0}` can be omitted or must be of type `string`", "when")));
         return false;
     }
     if (keyBinding.mac && typeof keyBinding.mac !== "string") {
-        rejects.push(( localize(16888, "property `{0}` can be omitted or must be of type `string`", "mac")));
+        rejects.push(( localize(17103, "property `{0}` can be omitted or must be of type `string`", "mac")));
         return false;
     }
     if (keyBinding.linux && typeof keyBinding.linux !== "string") {
         rejects.push(( localize(
-            16888,
+            17103,
             "property `{0}` can be omitted or must be of type `string`",
             "linux"
         )));
         return false;
     }
     if (keyBinding.win && typeof keyBinding.win !== "string") {
-        rejects.push(( localize(16888, "property `{0}` can be omitted or must be of type `string`", "win")));
+        rejects.push(( localize(17103, "property `{0}` can be omitted or must be of type `string`", "win")));
         return false;
     }
     return true;
@@ -97,33 +97,33 @@ const keybindingType = {
     required: ["command", "key"],
     properties: {
         command: {
-            description: ( localize(16889, "Identifier of the command to run when keybinding is triggered.")),
+            description: ( localize(17104, "Identifier of the command to run when keybinding is triggered.")),
             type: "string"
         },
         args: {
-            description: ( localize(16890, "Arguments to pass to the command to execute."))
+            description: ( localize(17105, "Arguments to pass to the command to execute."))
         },
         key: {
             description: ( localize(
-                16891,
+                17106,
                 "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(16892, "Mac specific key or key sequence.")),
+            description: ( localize(17107, "Mac specific key or key sequence.")),
             type: "string"
         },
         linux: {
-            description: ( localize(16893, "Linux specific key or key sequence.")),
+            description: ( localize(17108, "Linux specific key or key sequence.")),
             type: "string"
         },
         win: {
-            description: ( localize(16894, "Windows specific key or key sequence.")),
+            description: ( localize(17109, "Windows specific key or key sequence.")),
             type: "string"
         },
         when: {
-            description: ( localize(16895, "Condition when the key is active.")),
+            description: ( localize(17110, "Condition when the key is active.")),
             type: "string"
         }
     }
@@ -132,7 +132,7 @@ const keybindingsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "keybindings",
     deps: [commandsExtensionPoint],
     jsonSchema: {
-        description: ( localize(16896, "Contributes keybindings.")),
+        description: ( localize(17111, "Contributes keybindings.")),
         oneOf: [keybindingType, {
             type: "array",
             items: keybindingType
@@ -555,7 +555,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         }
         if (rejects.length > 0) {
             collector.error(( localize(
-                16897,
+                17112,
                 "Invalid `contributes.{0}`: {1}",
                 keybindingsExtPoint.name,
                 rejects.join("\n")
@@ -643,7 +643,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
     static _getAllCommandsAsComment(boundCommands) {
         const unboundCommands = getAllUnboundCommands(boundCommands);
         const pretty = unboundCommands.sort().join("\n// - ");
-        return "// " + ( localize(16898, "Here are other available commands: ")) + "\n// - " + pretty;
+        return "// " + ( localize(17113, "Here are other available commands: ")) + "\n// - " + pretty;
     }
     mightProducePrintableCharacter(event) {
         if (event.ctrlKey || event.metaKey || event.altKey) {
@@ -766,7 +766,7 @@ class KeybindingsJsonSchema {
         this.schema = {
             id: KeybindingsJsonSchema.schemaId,
             type: "array",
-            title: ( localize(16899, "Keybindings configuration")),
+            title: ( localize(17114, "Keybindings configuration")),
             allowTrailingCommas: true,
             allowComments: true,
             definitions: {
@@ -790,7 +790,7 @@ class KeybindingsJsonSchema {
                     "type": "string",
                     "enum": this.commandsEnum,
                     "enumDescriptions": this.commandsEnumDescriptions,
-                    "description": ( localize(16900, "Name of the command to execute"))
+                    "description": ( localize(17115, "Name of the command to execute"))
                 },
                 "commandType": {
                     "anyOf": [{
@@ -799,7 +799,7 @@ class KeybindingsJsonSchema {
                         "type": "string",
                         "enum": this.removalCommandsEnum,
                         "enumDescriptions": this.commandsEnumDescriptions,
-                        "description": ( localize(16901, "Name of the command to remove keyboard shortcut for"))
+                        "description": ( localize(17116, "Name of the command to remove keyboard shortcut for"))
                     }, {
                         "type": "string"
                     }]
@@ -821,7 +821,7 @@ class KeybindingsJsonSchema {
                 "properties": {
                     "key": {
                         "type": "string",
-                        "description": ( localize(16902, "Key or key sequence (separated by space)"))
+                        "description": ( localize(17117, "Key or key sequence (separated by space)"))
                     },
                     "command": {
                         "anyOf": [{
@@ -833,7 +833,7 @@ class KeybindingsJsonSchema {
                                     "type": "array"
                                 },
                                 "errorMessage": ( localize(
-                                    16903,
+                                    17118,
                                     "Incorrect type. Expected \"{0}\". The field 'command' does not support running multiple commands. Use command 'runCommands' to pass it multiple commands to run.",
                                     "string"
                                 ))
@@ -847,10 +847,10 @@ class KeybindingsJsonSchema {
                     },
                     "when": {
                         "type": "string",
-                        "description": ( localize(16904, "Condition when the key is active."))
+                        "description": ( localize(17119, "Condition when the key is active."))
                     },
                     "args": {
-                        "description": ( localize(16905, "Arguments to pass to the command to execute."))
+                        "description": ( localize(17120, "Arguments to pass to the command to execute."))
                     }
                 },
                 "$ref": "#/definitions/commandsSchemas"

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

@@ -93,9 +93,13 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
     }
     removeKeyboardLayout(layout) {
         let index = this._mru.indexOf(layout);
-        this._mru.splice(index, 1);
+        if (index !== -1) {
+            this._mru.splice(index, 1);
+        }
         index = this._keymapInfos.indexOf(layout);
-        this._keymapInfos.splice(index, 1);
+        if (index !== -1) {
+            this._keymapInfos.splice(index, 1);
+        }
     }
     getMatchedKeymapInfo(keyMapping) {
         if (!keyMapping) {
@@ -476,12 +480,12 @@ const keyboardConfiguration = {
     "id": "keyboard",
     "order": 15,
     "type": "object",
-    "title": ( localize(16906, "Keyboard")),
+    "title": ( localize(17121, "Keyboard")),
     "properties": {
         "keyboard.layout": {
             "type": "string",
             "default": "autodetect",
-            "description": ( localize(16907, "Control the keyboard layout used in web."))
+            "description": ( localize(17122, "Control the keyboard layout used in web."))
         }
     }
 };