@codingame/monaco-vscode-keybindings-service-override 18.3.1 → 19.0.0

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

@@ -1,4 +1,5 @@
 import { Keybinding, ResolvedKeybinding } from "@codingame/monaco-vscode-api/vscode/vs/base/common/keybindings";
+import { IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { ICommandService } from "@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
@@ -14,11 +15,9 @@ import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/plat
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 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 { ILayoutService } from "@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service";
 export declare class WorkbenchKeybindingService extends AbstractKeybindingService {
     private readonly hostService;
     private readonly keyboardLayoutService;
-    private readonly layoutService;
     private _keyboardMapper;
     private _cachedResolver;
     private userKeybindings;
@@ -26,9 +25,10 @@ export declare class WorkbenchKeybindingService extends AbstractKeybindingServic
     private _keybindingHoldMode;
     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, layoutService: ILayoutService);
+    constructor(contextKeyService: IContextKeyService, commandService: ICommandService, telemetryService: ITelemetryService, notificationService: INotificationService, userDataProfileService: IUserDataProfileService, hostService: IHostService, extensionService: IExtensionService, fileService: IFileService, uriIdentityService: IUriIdentityService, logService: ILogService, keyboardLayoutService: IKeyboardLayoutService);
+    dispose(): void;
     private _registerKeyListeners;
-    registerSchemaContribution(contribution: KeybindingsSchemaContribution): void;
+    registerSchemaContribution(contribution: KeybindingsSchemaContribution): IDisposable;
     private updateKeybindingsJsonSchema;
     private _printKeybinding;
     private _printResolvedKeybinding;

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

@@ -5,6 +5,7 @@ import { onDidChangeFullscreen, isFullscreen } from '@codingame/monaco-vscode-ap
 import { BrowserFeatures, KeyboardSupport } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/canIUse';
 import { onDidRegisterWindow, addDisposableListener, EventType, trackFocus, getWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { StandardKeyboardEvent, printKeyboardEvent, printStandardKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/keyboardEvent';
+import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
 import { DeferredPromise, RunOnceScheduler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 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';
@@ -12,11 +13,11 @@ import { UserSettingsLabelProvider } from '@codingame/monaco-vscode-api/vscode/v
 import { KeybindingParser } from '@codingame/monaco-vscode-2a22c7b4-b906-5914-8cd1-3ed912fb738f-common/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, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { DisposableStore, toDisposable, Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { OS, OperatingSystem, isMacintosh } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { dirname } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
-import { mainWindow } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/window';
+import { isLocalizedString } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/action';
 import { MenuRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
@@ -37,52 +38,51 @@ import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/pla
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
-import { isLocalizedString } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/action';
+import { remove } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { commandsExtensionPoint } from '../../actions/common/menusExtensionPoint.js';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
-import { getAllUnboundCommands } from '@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common/vscode/vs/workbench/services/keybinding/browser/unboundCommands';
-import { OutputBuilder, KeybindingIO } from '../common/keybindingIO.js';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
-import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.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';
 
 var WorkbenchKeybindingService_1;
 function isValidContributedKeyBinding(keyBinding, rejects) {
     if (!keyBinding) {
-        rejects.push(( localize(12708, "expected non-empty value.")));
+        rejects.push(( localize(12983, "expected non-empty value.")));
         return false;
     }
     if (typeof keyBinding.command !== 'string') {
         rejects.push(( localize(
-            12709,
+            12984,
             "property `{0}` is mandatory and must be of type `string`",
             'command'
         )));
         return false;
     }
     if (keyBinding.key && typeof keyBinding.key !== 'string') {
-        rejects.push(( localize(12710, "property `{0}` can be omitted or must be of type `string`", 'key')));
+        rejects.push(( localize(12985, "property `{0}` can be omitted or must be of type `string`", 'key')));
         return false;
     }
     if (keyBinding.when && typeof keyBinding.when !== 'string') {
-        rejects.push(( localize(12710, "property `{0}` can be omitted or must be of type `string`", 'when')));
+        rejects.push(( localize(12985, "property `{0}` can be omitted or must be of type `string`", 'when')));
         return false;
     }
     if (keyBinding.mac && typeof keyBinding.mac !== 'string') {
-        rejects.push(( localize(12710, "property `{0}` can be omitted or must be of type `string`", 'mac')));
+        rejects.push(( localize(12985, "property `{0}` can be omitted or must be of type `string`", 'mac')));
         return false;
     }
     if (keyBinding.linux && typeof keyBinding.linux !== 'string') {
         rejects.push(( localize(
-            12710,
+            12985,
             "property `{0}` can be omitted or must be of type `string`",
             'linux'
         )));
         return false;
     }
     if (keyBinding.win && typeof keyBinding.win !== 'string') {
-        rejects.push(( localize(12710, "property `{0}` can be omitted or must be of type `string`", 'win')));
+        rejects.push(( localize(12985, "property `{0}` can be omitted or must be of type `string`", 'win')));
         return false;
     }
     return true;
@@ -92,33 +92,33 @@ const keybindingType = {
     default: { command: '', key: '' },
     properties: {
         command: {
-            description: ( localize(12711, 'Identifier of the command to run when keybinding is triggered.')),
+            description: ( localize(12986, 'Identifier of the command to run when keybinding is triggered.')),
             type: 'string'
         },
         args: {
-            description: ( localize(12712, "Arguments to pass to the command to execute."))
+            description: ( localize(12987, "Arguments to pass to the command to execute."))
         },
         key: {
             description: ( localize(
-                12713,
+                12988,
                 '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(12714, 'Mac specific key or key sequence.')),
+            description: ( localize(12989, 'Mac specific key or key sequence.')),
             type: 'string'
         },
         linux: {
-            description: ( localize(12715, 'Linux specific key or key sequence.')),
+            description: ( localize(12990, 'Linux specific key or key sequence.')),
             type: 'string'
         },
         win: {
-            description: ( localize(12716, 'Windows specific key or key sequence.')),
+            description: ( localize(12991, 'Windows specific key or key sequence.')),
             type: 'string'
         },
         when: {
-            description: ( localize(12717, 'Condition when the key is active.')),
+            description: ( localize(12992, 'Condition when the key is active.')),
             type: 'string'
         },
     }
@@ -127,7 +127,7 @@ const keybindingsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'keybindings',
     deps: [commandsExtensionPoint],
     jsonSchema: {
-        description: ( localize(12718, "Contributes keybindings.")),
+        description: ( localize(12993, "Contributes keybindings.")),
         oneOf: [
             keybindingType,
             {
@@ -166,11 +166,10 @@ otherMacNumpadMapping.set(ScanCode.Numpad8, KeyCode.Digit8);
 otherMacNumpadMapping.set(ScanCode.Numpad9, KeyCode.Digit9);
 otherMacNumpadMapping.set(ScanCode.Numpad0, KeyCode.Digit0);
 let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchKeybindingService extends AbstractKeybindingService {
-    constructor(contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService, layoutService) {
+    constructor(contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService) {
         super(contextKeyService, commandService, telemetryService, notificationService, logService);
         this.hostService = hostService;
         this.keyboardLayoutService = keyboardLayoutService;
-        this.layoutService = layoutService;
         this._contributions = [];
         this.isComposingGlobalContextKey = contextKeyService.createKey('isComposing', false);
         this.kbsJsonSchema = ( new KeybindingsJsonSchema());
@@ -221,10 +220,14 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
             this._onDidUpdateKeybindings.fire();
         }));
     }
+    dispose() {
+        this._contributions.forEach(c => c.listener?.dispose());
+        this._contributions.length = 0;
+        super.dispose();
+    }
     _registerKeyListeners(window) {
         const disposables = ( new DisposableStore());
-        const container = this.layoutService.getContainer(window);
-        disposables.add(addDisposableListener(container, EventType.KEY_DOWN, (e) => {
+        disposables.add(addDisposableListener(window, EventType.KEY_DOWN, (e) => {
             if (this._keybindingHoldMode) {
                 return;
             }
@@ -238,7 +241,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
             }
             this.isComposingGlobalContextKey.set(false);
         }));
-        disposables.add(addDisposableListener(container, EventType.KEY_UP, (e) => {
+        disposables.add(addDisposableListener(window, EventType.KEY_UP, (e) => {
             this._resetKeybindingHoldMode();
             this.isComposingGlobalContextKey.set(e.isComposing);
             const keyEvent = ( new StandardKeyboardEvent(e));
@@ -251,14 +254,18 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         return disposables;
     }
     registerSchemaContribution(contribution) {
-        this._contributions.push(contribution);
-        if (contribution.onDidChange) {
-            this._register(contribution.onDidChange(() => this.updateKeybindingsJsonSchema()));
-        }
+        const listener = contribution.onDidChange?.(() => this.updateKeybindingsJsonSchema());
+        const entry = { listener, contribution };
+        this._contributions.push(entry);
         this.updateKeybindingsJsonSchema();
+        return toDisposable(() => {
+            listener?.dispose();
+            remove(this._contributions, entry);
+            this.updateKeybindingsJsonSchema();
+        });
     }
     updateKeybindingsJsonSchema() {
-        this.kbsJsonSchema.updateSchema(this._contributions.flatMap(x => x.getSchemaAdditions()));
+        this.kbsJsonSchema.updateSchema(this._contributions.flatMap(x => x.contribution.getSchemaAdditions()));
     }
     _printKeybinding(keybinding) {
         return UserSettingsLabelProvider.toLabel(OS, keybinding.chords, (chord) => {
@@ -508,7 +515,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         }
         if (rejects.length > 0) {
             collector.error(( localize(
-                12719,
+                12994,
                 "Invalid `contributes.{0}`: {1}",
                 keybindingsExtPoint.name,
                 rejects.join('\n')
@@ -596,7 +603,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
     static _getAllCommandsAsComment(boundCommands) {
         const unboundCommands = getAllUnboundCommands(boundCommands);
         const pretty = unboundCommands.sort().join('\n// - ');
-        return '// ' + ( localize(12720, "Here are other available commands: ")) + '\n// - ' + pretty;
+        return '// ' + ( localize(12995, "Here are other available commands: ")) + '\n// - ' + pretty;
     }
     mightProducePrintableCharacter(event) {
         if (event.ctrlKey || event.metaKey || event.altKey) {
@@ -641,8 +648,7 @@ WorkbenchKeybindingService = WorkbenchKeybindingService_1 = ( __decorate([
     ( __param(7, IFileService)),
     ( __param(8, IUriIdentityService)),
     ( __param(9, ILogService)),
-    ( __param(10, IKeyboardLayoutService)),
-    ( __param(11, ILayoutService))
+    ( __param(10, IKeyboardLayoutService))
 ], WorkbenchKeybindingService));
 class UserKeybindings extends Disposable {
     get keybindings() { return this._keybindings; }
@@ -722,7 +728,7 @@ class KeybindingsJsonSchema {
         this.schema = {
             id: KeybindingsJsonSchema.schemaId,
             type: 'array',
-            title: ( localize(12721, "Keybindings configuration")),
+            title: ( localize(12996, "Keybindings configuration")),
             allowTrailingCommas: true,
             allowComments: true,
             definitions: {
@@ -746,7 +752,7 @@ class KeybindingsJsonSchema {
                     'type': 'string',
                     'enum': this.commandsEnum,
                     'enumDescriptions': this.commandsEnumDescriptions,
-                    'description': ( localize(12722, "Name of the command to execute")),
+                    'description': ( localize(12997, "Name of the command to execute")),
                 },
                 'commandType': {
                     'anyOf': [
@@ -757,7 +763,7 @@ class KeybindingsJsonSchema {
                             'type': 'string',
                             'enum': this.removalCommandsEnum,
                             'enumDescriptions': this.commandsEnumDescriptions,
-                            'description': ( localize(12723, "Name of the command to remove keyboard shortcut for")),
+                            'description': ( localize(12998, "Name of the command to remove keyboard shortcut for")),
                         },
                         {
                             'type': 'string'
@@ -775,7 +781,7 @@ class KeybindingsJsonSchema {
                 'properties': {
                     'key': {
                         'type': 'string',
-                        'description': ( localize(12724, "Key or key sequence (separated by space)")),
+                        'description': ( localize(12999, "Key or key sequence (separated by space)")),
                     },
                     'command': {
                         'anyOf': [
@@ -788,7 +794,7 @@ class KeybindingsJsonSchema {
                                         'type': 'array'
                                     },
                                     'errorMessage': ( localize(
-                                        12725,
+                                        13000,
                                         "Incorrect type. Expected \"{0}\". The field 'command' does not support running multiple commands. Use command 'runCommands' to pass it multiple commands to run.",
                                         'string'
                                     ))
@@ -804,10 +810,10 @@ class KeybindingsJsonSchema {
                     },
                     'when': {
                         'type': 'string',
-                        'description': ( localize(12726, "Condition when the key is active."))
+                        'description': ( localize(13001, "Condition when the key is active."))
                     },
                     'args': {
-                        'description': ( localize(12727, "Arguments to pass to the command to execute."))
+                        'description': ( localize(13002, "Arguments to pass to the command to execute."))
                     }
                 },
                 '$ref': '#/definitions/commandsSchemas'

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

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