@codingame/monaco-vscode-keybindings-service-override 23.2.2 → 24.1.0

package/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.d.ts

@@ -26,6 +26,7 @@ export declare class WorkbenchKeybindingService extends AbstractKeybindingServic
     private readonly _contributions;
     private readonly kbsJsonSchema;
     constructor(contextKeyService: IContextKeyService, commandService: ICommandService, telemetryService: ITelemetryService, notificationService: INotificationService, userDataProfileService: IUserDataProfileService, hostService: IHostService, extensionService: IExtensionService, fileService: IFileService, uriIdentityService: IUriIdentityService, logService: ILogService, keyboardLayoutService: IKeyboardLayoutService);
+    protected lockKeyCodes(keyCodes: string[]): void;
     dispose(): void;
     private _registerKeyListeners;
     registerSchemaContribution(contribution: KeybindingsSchemaContribution): IDisposable;

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

@@ -10,7 +10,7 @@ import { DeferredPromise, RunOnceScheduler } from '@codingame/monaco-vscode-api/
 import { Event, Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
 import { UserSettingsLabelProvider } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keybindingLabels';
-import { KeybindingParser } from '@codingame/monaco-vscode-2a22c7b4-b906-5914-8cd1-3ed912fb738f-common/vscode/vs/base/common/keybindingParser';
+import { KeybindingParser } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keybindingParser';
 import { KeyCodeChord, ScanCodeChord } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keybindings';
 import { ScanCode, KeyCode, KeyCodeUtils, ScanCodeUtils, KeyMod, IMMUTABLE_CODE_TO_KEY_CODE } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { DisposableStore, toDisposable, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
@@ -45,44 +45,44 @@ import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workb
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { OutputBuilder, KeybindingIO } from '../common/keybindingIO.js';
-import { getAllUnboundCommands } from '@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common/vscode/vs/workbench/services/keybinding/browser/unboundCommands';
+import { getAllUnboundCommands } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/keybinding/browser/unboundCommands';
 
 var WorkbenchKeybindingService_1;
 function isValidContributedKeyBinding(keyBinding, rejects) {
     if (!keyBinding) {
-        rejects.push(( localize(13919, "expected non-empty value.")));
+        rejects.push(( localize(14060, "expected non-empty value.")));
         return false;
     }
     if (typeof keyBinding.command !== 'string') {
         rejects.push(( localize(
-            13920,
+            14061,
             "property `{0}` is mandatory and must be of type `string`",
             'command'
         )));
         return false;
     }
     if (keyBinding.key && typeof keyBinding.key !== 'string') {
-        rejects.push(( localize(13921, "property `{0}` can be omitted or must be of type `string`", 'key')));
+        rejects.push(( localize(14062, "property `{0}` can be omitted or must be of type `string`", 'key')));
         return false;
     }
     if (keyBinding.when && typeof keyBinding.when !== 'string') {
-        rejects.push(( localize(13921, "property `{0}` can be omitted or must be of type `string`", 'when')));
+        rejects.push(( localize(14062, "property `{0}` can be omitted or must be of type `string`", 'when')));
         return false;
     }
     if (keyBinding.mac && typeof keyBinding.mac !== 'string') {
-        rejects.push(( localize(13921, "property `{0}` can be omitted or must be of type `string`", 'mac')));
+        rejects.push(( localize(14062, "property `{0}` can be omitted or must be of type `string`", 'mac')));
         return false;
     }
     if (keyBinding.linux && typeof keyBinding.linux !== 'string') {
         rejects.push(( localize(
-            13921,
+            14062,
             "property `{0}` can be omitted or must be of type `string`",
             'linux'
         )));
         return false;
     }
     if (keyBinding.win && typeof keyBinding.win !== 'string') {
-        rejects.push(( localize(13921, "property `{0}` can be omitted or must be of type `string`", 'win')));
+        rejects.push(( localize(14062, "property `{0}` can be omitted or must be of type `string`", 'win')));
         return false;
     }
     return true;
@@ -93,33 +93,33 @@ const keybindingType = {
     required: ['command', 'key'],
     properties: {
         command: {
-            description: ( localize(13922, 'Identifier of the command to run when keybinding is triggered.')),
+            description: ( localize(14063, 'Identifier of the command to run when keybinding is triggered.')),
             type: 'string'
         },
         args: {
-            description: ( localize(13923, "Arguments to pass to the command to execute."))
+            description: ( localize(14064, "Arguments to pass to the command to execute."))
         },
         key: {
             description: ( localize(
-                13924,
+                14065,
                 '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(13925, 'Mac specific key or key sequence.')),
+            description: ( localize(14066, 'Mac specific key or key sequence.')),
             type: 'string'
         },
         linux: {
-            description: ( localize(13926, 'Linux specific key or key sequence.')),
+            description: ( localize(14067, 'Linux specific key or key sequence.')),
             type: 'string'
         },
         win: {
-            description: ( localize(13927, 'Windows specific key or key sequence.')),
+            description: ( localize(14068, 'Windows specific key or key sequence.')),
             type: 'string'
         },
         when: {
-            description: ( localize(13928, 'Condition when the key is active.')),
+            description: ( localize(14069, 'Condition when the key is active.')),
             type: 'string'
         },
     }
@@ -128,7 +128,7 @@ const keybindingsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'keybindings',
     deps: [commandsExtensionPoint],
     jsonSchema: {
-        description: ( localize(13929, "Contributes keybindings.")),
+        description: ( localize(14070, "Contributes keybindings.")),
         oneOf: [
             keybindingType,
             {
@@ -207,20 +207,23 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
             if (windowId !== mainWindow.vscodeWindowId) {
                 return;
             }
-            const keyboard = navigator.keyboard;
             if (BrowserFeatures.keyboard === KeyboardSupport.None) {
                 return;
             }
-            if (isFullscreen(mainWindow)) {
-                keyboard?.lock(['Escape']);
-            }
-            else {
-                keyboard?.unlock();
-            }
+            this.lockKeyCodes(isFullscreen(mainWindow) ? ['Escape'] : []);
             this._cachedResolver = null;
             this._onDidUpdateKeybindings.fire();
         }));
     }
+    lockKeyCodes(keyCodes) {
+        const keyboard = mainWindow.navigator.keyboard;
+        if (keyCodes.length > 0) {
+            keyboard?.lock(keyCodes);
+        }
+        else {
+            keyboard?.unlock();
+        }
+    }
     dispose() {
         this._contributions.forEach(c => c.listener?.dispose());
         this._contributions.length = 0;
@@ -516,7 +519,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         }
         if (rejects.length > 0) {
             collector.error(( localize(
-                13930,
+                14071,
                 "Invalid `contributes.{0}`: {1}",
                 keybindingsExtPoint.name,
                 rejects.join('\n')
@@ -604,7 +607,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
     static _getAllCommandsAsComment(boundCommands) {
         const unboundCommands = getAllUnboundCommands(boundCommands);
         const pretty = unboundCommands.sort().join('\n// - ');
-        return '// ' + ( localize(13931, "Here are other available commands: ")) + '\n// - ' + pretty;
+        return '// ' + ( localize(14072, "Here are other available commands: ")) + '\n// - ' + pretty;
     }
     mightProducePrintableCharacter(event) {
         if (event.ctrlKey || event.metaKey || event.altKey) {
@@ -729,7 +732,7 @@ class KeybindingsJsonSchema {
         this.schema = {
             id: KeybindingsJsonSchema.schemaId,
             type: 'array',
-            title: ( localize(13932, "Keybindings configuration")),
+            title: ( localize(14073, "Keybindings configuration")),
             allowTrailingCommas: true,
             allowComments: true,
             definitions: {
@@ -753,7 +756,7 @@ class KeybindingsJsonSchema {
                     'type': 'string',
                     'enum': this.commandsEnum,
                     'enumDescriptions': this.commandsEnumDescriptions,
-                    'description': ( localize(13933, "Name of the command to execute")),
+                    'description': ( localize(14074, "Name of the command to execute")),
                 },
                 'commandType': {
                     'anyOf': [
@@ -764,7 +767,7 @@ class KeybindingsJsonSchema {
                             'type': 'string',
                             'enum': this.removalCommandsEnum,
                             'enumDescriptions': this.commandsEnumDescriptions,
-                            'description': ( localize(13934, "Name of the command to remove keyboard shortcut for")),
+                            'description': ( localize(14075, "Name of the command to remove keyboard shortcut for")),
                         },
                         {
                             'type': 'string'
@@ -782,7 +785,7 @@ class KeybindingsJsonSchema {
                 'properties': {
                     'key': {
                         'type': 'string',
-                        'description': ( localize(13935, "Key or key sequence (separated by space)")),
+                        'description': ( localize(14076, "Key or key sequence (separated by space)")),
                     },
                     'command': {
                         'anyOf': [
@@ -795,7 +798,7 @@ class KeybindingsJsonSchema {
                                         'type': 'array'
                                     },
                                     'errorMessage': ( localize(
-                                        13936,
+                                        14077,
                                         "Incorrect type. Expected \"{0}\". The field 'command' does not support running multiple commands. Use command 'runCommands' to pass it multiple commands to run.",
                                         'string'
                                     ))
@@ -811,10 +814,10 @@ class KeybindingsJsonSchema {
                     },
                     'when': {
                         'type': 'string',
-                        'description': ( localize(13937, "Condition when the key is active."))
+                        'description': ( localize(14078, "Condition when the key is active."))
                     },
                     'args': {
-                        'description': ( localize(13938, "Arguments to pass to the command to execute."))
+                        'description': ( localize(14079, "Arguments to pass to the command to execute."))
                     }
                 },
                 '$ref': '#/definitions/commandsSchemas'

package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.d.ts

@@ -9,7 +9,7 @@ import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { IKeyboardLayoutInfo, IKeyboardMapping } from "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common/vscode/vs/platform/keyboardLayout/common/keyboardLayout";
+import { IKeyboardLayoutInfo, IKeyboardMapping } from "@codingame/monaco-vscode-api/vscode/vs/platform/keyboardLayout/common/keyboardLayout";
 import { IKeyboardLayoutService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keyboardLayout/common/keyboardLayout.service";
 export declare class BrowserKeyboardMapperFactoryBase extends Disposable {
     private readonly _configurationService;

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

@@ -22,7 +22,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { getKeyboardLayoutId } from '@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
+import { getKeyboardLayoutId } from '@codingame/monaco-vscode-api/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 
 function __variableDynamicImportRuntime0__(path) {
@@ -483,12 +483,12 @@ const keyboardConfiguration = {
     'id': 'keyboard',
     'order': 15,
     'type': 'object',
-    'title': ( localize(13939, "Keyboard")),
+    'title': ( localize(14080, "Keyboard")),
     'properties': {
         'keyboard.layout': {
             'type': 'string',
             'default': 'autodetect',
-            'description': ( localize(13940, "Control the keyboard layout used in web."))
+            'description': ( localize(14081, "Control the keyboard layout used in web."))
         }
     }
 };

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

@@ -4,7 +4,7 @@ import { ResolvedKeybindingItem } from "@codingame/monaco-vscode-api/vscode/vs/p
 export interface IUserKeybindingItem {
     keybinding: Keybinding | null;
     command: string | null;
-    commandArgs?: any;
+    commandArgs?: unknown;
     when: ContextKeyExpression | undefined;
     _sourceKey: string | undefined; /** captures `key` field from `keybindings.json`; `this.keybinding !== null` implies `_sourceKey !== null` */
 }

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

@@ -1,5 +1,5 @@
 
-import { KeybindingParser } from '@codingame/monaco-vscode-2a22c7b4-b906-5914-8cd1-3ed912fb738f-common/vscode/vs/base/common/keybindingParser';
+import { KeybindingParser } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keybindingParser';
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 
 class KeybindingIO {

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

@@ -1,4 +1,4 @@
-import { IKeyboardLayoutInfo } from "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common/vscode/vs/platform/keyboardLayout/common/keyboardLayout";
+import { IKeyboardLayoutInfo } from "@codingame/monaco-vscode-api/vscode/vs/platform/keyboardLayout/common/keyboardLayout";
 export interface IRawMixedKeyboardMapping {
     [key: string]: {
         value: string;

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

@@ -1,6 +1,6 @@
 
 import { isWindows, isLinux } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
-import { getKeyboardLayoutId } from '@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
+import { getKeyboardLayoutId } from '@codingame/monaco-vscode-api/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
 
 function deserializeMapping(serializedMapping) {
     const mapping = serializedMapping;

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

@@ -3,7 +3,7 @@ import { OperatingSystem } from "@codingame/monaco-vscode-api/vscode/vs/base/com
 import { IKeyboardEvent } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding";
 import { IKeyboardMapper } from "../../../../platform/keyboardLayout/common/keyboardMapper.js";
 import { BaseResolvedKeybinding } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/baseResolvedKeybinding";
-import { IMacLinuxKeyboardMapping } from "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common/vscode/vs/platform/keyboardLayout/common/keyboardLayout";
+import { IMacLinuxKeyboardMapping } from "@codingame/monaco-vscode-api/vscode/vs/platform/keyboardLayout/common/keyboardLayout";
 export declare class NativeResolvedKeybinding extends BaseResolvedKeybinding<ScanCodeChord> {
     private readonly _mapper;
     constructor(mapper: MacLinuxKeyboardMapper, os: OperatingSystem, chords: ScanCodeChord[]);

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

@@ -1,6 +1,6 @@
 
 import { CharCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/charCode';
-import { IMMUTABLE_CODE_TO_KEY_CODE, KeyCode, ScanCode, ScanCodeUtils, KeyCodeUtils, IMMUTABLE_KEY_CODE_TO_CODE } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
+import { IMMUTABLE_CODE_TO_KEY_CODE, KeyCode, ScanCode, ScanCodeUtils, KeyCodeUtils, isModifierKey, IMMUTABLE_KEY_CODE_TO_CODE } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyCodes';
 import { ScanCodeChord, KeyCodeChord } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keybindings';
 import { OperatingSystem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { BaseResolvedKeybinding } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/baseResolvedKeybinding';
@@ -294,7 +294,7 @@ class MacLinuxKeyboardMapper {
             if (keyCode !== KeyCode.DependsOnKbLayout) {
                 _registerAllCombos(0, 0, 0, scanCode, keyCode);
                 this._scanCodeToLabel[scanCode] = ( KeyCodeUtils.toString(keyCode));
-                if (keyCode === KeyCode.Unknown || keyCode === KeyCode.Ctrl || keyCode === KeyCode.Meta || keyCode === KeyCode.Alt || keyCode === KeyCode.Shift) {
+                if (keyCode === KeyCode.Unknown || isModifierKey(keyCode)) {
                     this._scanCodeToDispatch[scanCode] = null;
                 }
                 else {

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

@@ -3,7 +3,7 @@ import { ResolvedKeybinding, KeyCodeChord, SingleModifierChord, ScanCodeChord, K
 import { IKeyboardEvent } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding";
 import { IKeyboardMapper } from "../../../../platform/keyboardLayout/common/keyboardMapper.js";
 import { BaseResolvedKeybinding } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/baseResolvedKeybinding";
-import { IWindowsKeyboardMapping } from "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common/vscode/vs/platform/keyboardLayout/common/keyboardLayout";
+import { IWindowsKeyboardMapping } from "@codingame/monaco-vscode-api/vscode/vs/platform/keyboardLayout/common/keyboardLayout";
 export interface IScanCodeMapping {
     scanCode: ScanCode;
     keyCode: KeyCode;