@codingame/monaco-vscode-keybindings-service-override 34.1.3 → 35.0.1

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(17101, "expected non-empty value.")));
+        rejects.push(( localize(17765, "expected non-empty value.")));
         return false;
     }
     if (typeof keyBinding.command !== "string") {
         rejects.push(( localize(
-            17102,
+            17766,
             "property `{0}` is mandatory and must be of type `string`",
             "command"
         )));
         return false;
     }
     if (keyBinding.key && typeof keyBinding.key !== "string") {
-        rejects.push(( localize(17103, "property `{0}` can be omitted or must be of type `string`", "key")));
+        rejects.push(( localize(17767, "property `{0}` can be omitted or must be of type `string`", "key")));
         return false;
     }
     if (keyBinding.when && typeof keyBinding.when !== "string") {
-        rejects.push(( localize(17103, "property `{0}` can be omitted or must be of type `string`", "when")));
+        rejects.push(( localize(17767, "property `{0}` can be omitted or must be of type `string`", "when")));
         return false;
     }
     if (keyBinding.mac && typeof keyBinding.mac !== "string") {
-        rejects.push(( localize(17103, "property `{0}` can be omitted or must be of type `string`", "mac")));
+        rejects.push(( localize(17767, "property `{0}` can be omitted or must be of type `string`", "mac")));
         return false;
     }
     if (keyBinding.linux && typeof keyBinding.linux !== "string") {
         rejects.push(( localize(
-            17103,
+            17767,
             "property `{0}` can be omitted or must be of type `string`",
             "linux"
         )));
         return false;
     }
     if (keyBinding.win && typeof keyBinding.win !== "string") {
-        rejects.push(( localize(17103, "property `{0}` can be omitted or must be of type `string`", "win")));
+        rejects.push(( localize(17767, "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(17104, "Identifier of the command to run when keybinding is triggered.")),
+            description: ( localize(17768, "Identifier of the command to run when keybinding is triggered.")),
             type: "string"
         },
         args: {
-            description: ( localize(17105, "Arguments to pass to the command to execute."))
+            description: ( localize(17769, "Arguments to pass to the command to execute."))
         },
         key: {
             description: ( localize(
-                17106,
+                17770,
                 "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(17107, "Mac specific key or key sequence.")),
+            description: ( localize(17771, "Mac specific key or key sequence.")),
             type: "string"
         },
         linux: {
-            description: ( localize(17108, "Linux specific key or key sequence.")),
+            description: ( localize(17772, "Linux specific key or key sequence.")),
             type: "string"
         },
         win: {
-            description: ( localize(17109, "Windows specific key or key sequence.")),
+            description: ( localize(17773, "Windows specific key or key sequence.")),
             type: "string"
         },
         when: {
-            description: ( localize(17110, "Condition when the key is active.")),
+            description: ( localize(17774, "Condition when the key is active.")),
             type: "string"
         }
     }
@@ -132,7 +132,7 @@ const keybindingsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "keybindings",
     deps: [commandsExtensionPoint],
     jsonSchema: {
-        description: ( localize(17111, "Contributes keybindings.")),
+        description: ( localize(17775, "Contributes keybindings.")),
         oneOf: [keybindingType, {
             type: "array",
             items: keybindingType
@@ -463,7 +463,16 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         for (const item of items) {
             const when = item.when || undefined;
             if (!item.keybinding) {
-                result[resultLen++] = ( new ResolvedKeybindingItem(undefined, item.command, item.commandArgs, when, isDefault, null, false));
+                result[resultLen++] = ( new ResolvedKeybindingItem(
+                    undefined,
+                    item.command,
+                    item.commandArgs,
+                    when,
+                    isDefault,
+                    null,
+                    false,
+                    item.systemWide
+                ));
             } else {
                 const resolvedKeybindings = this._keyboardMapper.resolveKeybinding(item.keybinding);
                 for (const resolvedKeybinding of resolvedKeybindings) {
@@ -474,7 +483,8 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
                         when,
                         isDefault,
                         null,
-                        false
+                        false,
+                        item.systemWide
                     ));
                 }
             }
@@ -555,7 +565,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         }
         if (rejects.length > 0) {
             collector.error(( localize(
-                17112,
+                17776,
                 "Invalid `contributes.{0}`: {1}",
                 keybindingsExtPoint.name,
                 rejects.join("\n")
@@ -643,7 +653,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
     static _getAllCommandsAsComment(boundCommands) {
         const unboundCommands = getAllUnboundCommands(boundCommands);
         const pretty = unboundCommands.sort().join("\n// - ");
-        return "// " + ( localize(17113, "Here are other available commands: ")) + "\n// - " + pretty;
+        return "// " + ( localize(17777, "Here are other available commands: ")) + "\n// - " + pretty;
     }
     mightProducePrintableCharacter(event) {
         if (event.ctrlKey || event.metaKey || event.altKey) {
@@ -766,7 +776,7 @@ class KeybindingsJsonSchema {
         this.schema = {
             id: KeybindingsJsonSchema.schemaId,
             type: "array",
-            title: ( localize(17114, "Keybindings configuration")),
+            title: ( localize(17778, "Keybindings configuration")),
             allowTrailingCommas: true,
             allowComments: true,
             definitions: {
@@ -790,7 +800,7 @@ class KeybindingsJsonSchema {
                     "type": "string",
                     "enum": this.commandsEnum,
                     "enumDescriptions": this.commandsEnumDescriptions,
-                    "description": ( localize(17115, "Name of the command to execute"))
+                    "description": ( localize(17779, "Name of the command to execute"))
                 },
                 "commandType": {
                     "anyOf": [{
@@ -799,7 +809,7 @@ class KeybindingsJsonSchema {
                         "type": "string",
                         "enum": this.removalCommandsEnum,
                         "enumDescriptions": this.commandsEnumDescriptions,
-                        "description": ( localize(17116, "Name of the command to remove keyboard shortcut for"))
+                        "description": ( localize(17780, "Name of the command to remove keyboard shortcut for"))
                     }, {
                         "type": "string"
                     }]
@@ -821,7 +831,7 @@ class KeybindingsJsonSchema {
                 "properties": {
                     "key": {
                         "type": "string",
-                        "description": ( localize(17117, "Key or key sequence (separated by space)"))
+                        "description": ( localize(17781, "Key or key sequence (separated by space)"))
                     },
                     "command": {
                         "anyOf": [{
@@ -833,7 +843,7 @@ class KeybindingsJsonSchema {
                                     "type": "array"
                                 },
                                 "errorMessage": ( localize(
-                                    17118,
+                                    17782,
                                     "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 +857,18 @@ class KeybindingsJsonSchema {
                     },
                     "when": {
                         "type": "string",
-                        "description": ( localize(17119, "Condition when the key is active."))
+                        "description": ( localize(17783, "Condition when the key is active."))
                     },
                     "args": {
-                        "description": ( localize(17120, "Arguments to pass to the command to execute."))
+                        "description": ( localize(17784, "Arguments to pass to the command to execute."))
+                    },
+                    "systemWide": {
+                        "type": "boolean",
+                        "default": false,
+                        "markdownDescription": ( localize(
+                            17785,
+                            "When `true`, registers this keybinding as a system-wide (OS global) shortcut that fires even when the application is not focused. Desktop only. Only single key combinations are supported (no chords), and any `when` clause is ignored for the global trigger."
+                        ))
                     }
                 },
                 "$ref": "#/definitions/commandsSchemas"

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

@@ -480,12 +480,12 @@ const keyboardConfiguration = {
     "id": "keyboard",
     "order": 15,
     "type": "object",
-    "title": ( localize(17121, "Keyboard")),
+    "title": ( localize(17786, "Keyboard")),
     "properties": {
         "keyboard.layout": {
             "type": "string",
             "default": "autodetect",
-            "description": ( localize(17122, "Control the keyboard layout used in web."))
+            "description": ( localize(17787, "Control the keyboard layout used in web."))
         }
     }
 };

package/vscode/src/vs/workbench/services/keybinding/common/keybindingIO.d.ts

@@ -6,6 +6,7 @@ export interface IUserKeybindingItem {
     command: string | null;
     commandArgs?: unknown;
     when: ContextKeyExpression | undefined;
+    systemWide: boolean;
     _sourceKey: string | undefined; /** captures `key` field from `keybindings.json`; `this.keybinding !== null` implies `_sourceKey !== null` */
 }
 export declare class KeybindingIO {

package/vscode/src/vs/workbench/services/keybinding/common/keybindingIO.js

@@ -27,6 +27,11 @@ class KeybindingIO {
                 `                                     "args": ${JSON.stringify(item.commandArgs)}`
             );
         }
+        if (item.systemWide) {
+            out.write(",");
+            out.writeLine();
+            out.write(`                                     "systemWide": true`);
+        }
         out.write(" }");
     }
     static readUserKeybindingItem(input) {
@@ -34,11 +39,13 @@ class KeybindingIO {
         const when = "when" in input && typeof input.when === "string" ? ContextKeyExpr.deserialize(input.when) : undefined;
         const command = "command" in input && typeof input.command === "string" ? input.command : null;
         const commandArgs = "args" in input && typeof input.args !== "undefined" ? input.args : undefined;
+        const systemWide = "systemWide" in input && typeof input.systemWide === "boolean" ? input.systemWide : false;
         return {
             keybinding,
             command,
             commandArgs,
             when,
+            systemWide,
             _sourceKey: "key" in input && typeof input.key === "string" ? input.key : undefined
         };
     }