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

package/index.d.ts

@@ -11,9 +11,16 @@ declare function initUserKeybindings(configurationJson: string, options?: Partia
  * Can be called at any time after the services are initialized to update the user configuration
  */
 declare function updateUserKeybindings(keybindingsJson: string): Promise<void>;
-interface KeybindingsProps {
+export interface LockKeyCodesOverride {
+    (keyCodes: string[], next: (keyCodes: string[]) => void): void;
+}
+export interface KeybindingsProps {
     shouldUseGlobalKeybindings?: () => boolean;
+    /**
+     * Allows to override the key code lock (for instance, ['Escape'] during full screen)
+     */
+    lockKeyCodesOverride?: LockKeyCodesOverride;
 }
-export default function getServiceOverride({ shouldUseGlobalKeybindings }?: KeybindingsProps): IEditorOverrideServices;
+export default function getServiceOverride({ shouldUseGlobalKeybindings, lockKeyCodesOverride }?: KeybindingsProps): IEditorOverrideServices;
 export { defaultUserKeybindindsFile, initUserKeybindings, updateUserKeybindings };
 export type { IUserFriendlyKeybinding };

package/index.js

@@ -23,7 +23,7 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import getServiceOverride$1, { initFile } from '@codingame/monaco-vscode-files-service-override';
-import '@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common/vscode/vs/workbench/browser/workbench.contribution';
+import '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/workbench.contribution';
 import './vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js';
 import './vscode/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.js';
 import './vscode/src/vs/workbench/contrib/commands/common/commands.contribution.js';
@@ -42,9 +42,10 @@ async function updateUserKeybindings(keybindingsJson) {
     await fileService.writeFile(userDataProfilesService.defaultProfile.keybindingsResource, VSBuffer.fromString(keybindingsJson));
 }
 let DynamicWorkbenchKeybindingService = class DynamicWorkbenchKeybindingService extends WorkbenchKeybindingService {
-    constructor(shouldUseGlobalKeybindings, contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService) {
+    constructor(shouldUseGlobalKeybindings, _lockKeyCodesOverride, contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService) {
         super(contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService);
         this.shouldUseGlobalKeybindings = shouldUseGlobalKeybindings;
+        this._lockKeyCodesOverride = _lockKeyCodesOverride;
         this.keybindingProviders = [];
         this.authorizedContainers = [];
     }
@@ -89,24 +90,29 @@ let DynamicWorkbenchKeybindingService = class DynamicWorkbenchKeybindingService
             ...this.keybindingProviders.flatMap((provider) => provider.provideKeybindings())
         ];
     }
+    lockKeyCodes(keyCodes) {
+        this._lockKeyCodesOverride(keyCodes, (keyCodes) => super.lockKeyCodes(keyCodes));
+    }
 };
 DynamicWorkbenchKeybindingService = __decorate([
-    __param(1, IContextKeyService),
-    __param(2, ICommandService),
-    __param(3, ITelemetryService),
-    __param(4, INotificationService),
-    __param(5, IUserDataProfileService),
-    __param(6, IHostService),
-    __param(7, IExtensionService),
-    __param(8, IFileService),
-    __param(9, IUriIdentityService),
-    __param(10, ILogService),
-    __param(11, IKeyboardLayoutService)
+    __param(2, IContextKeyService),
+    __param(3, ICommandService),
+    __param(4, ITelemetryService),
+    __param(5, INotificationService),
+    __param(6, IUserDataProfileService),
+    __param(7, IHostService),
+    __param(8, IExtensionService),
+    __param(9, IFileService),
+    __param(10, IUriIdentityService),
+    __param(11, ILogService),
+    __param(12, IKeyboardLayoutService)
 ], DynamicWorkbenchKeybindingService);
-function getServiceOverride({ shouldUseGlobalKeybindings = () => false } = {}) {
+function getServiceOverride({ shouldUseGlobalKeybindings = () => false, lockKeyCodesOverride = (keyCodes, next) => {
+    next(keyCodes);
+} } = {}) {
     return {
         ...getServiceOverride$1(),
-        [IKeybindingService.toString()]: new SyncDescriptor(DynamicWorkbenchKeybindingService, [shouldUseGlobalKeybindings], false),
+        [IKeybindingService.toString()]: new SyncDescriptor(DynamicWorkbenchKeybindingService, [shouldUseGlobalKeybindings, lockKeyCodesOverride], false),
         [IKeyboardLayoutService.toString()]: new SyncDescriptor(BrowserKeyboardLayoutService, [], true),
         [ICommandService.toString()]: new SyncDescriptor(CommandService, [], true)
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-keybindings-service-override",
-  "version": "23.2.2",
+  "version": "24.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - keybindings service-override",
   "keywords": [],
@@ -15,13 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-2808e692-5fb9-54bf-bc21-1d3bff81e651-common": "23.2.2",
-    "@codingame/monaco-vscode-2a22c7b4-b906-5914-8cd1-3ed912fb738f-common": "23.2.2",
-    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "23.2.2",
-    "@codingame/monaco-vscode-a3eaa464-944c-5b8f-8886-213068ba4897-common": "23.2.2",
-    "@codingame/monaco-vscode-api": "23.2.2",
-    "@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common": "23.2.2",
-    "@codingame/monaco-vscode-files-service-override": "23.2.2"
+    "@codingame/monaco-vscode-api": "24.1.0",
+    "@codingame/monaco-vscode-files-service-override": "24.1.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/keyboardLayout/common/keyboardConfig.js

@@ -20,7 +20,7 @@ const keyboardConfiguration = {
     'id': 'keyboard',
     'order': 15,
     'type': 'object',
-    'title': ( localize(1933, "Keyboard")),
+    'title': ( localize(1945, "Keyboard")),
     'properties': {
         'keyboard.dispatch': {
             scope: ConfigurationScope.APPLICATION,
@@ -28,7 +28,7 @@ const keyboardConfiguration = {
             enum: ['code', 'keyCode'],
             default: 'code',
             markdownDescription: ( localize(
-                1934,
+                1946,
                 "Controls the dispatching logic for key presses to use either `code` (recommended) or `keyCode`."
             )),
             included: OS === OperatingSystem.Macintosh || OS === OperatingSystem.Linux
@@ -37,7 +37,7 @@ const keyboardConfiguration = {
             scope: ConfigurationScope.APPLICATION,
             type: 'boolean',
             default: false,
-            markdownDescription: ( localize(1935, "Controls if the AltGraph+ modifier should be treated as Ctrl+Alt+.")),
+            markdownDescription: ( localize(1947, "Controls if the AltGraph+ modifier should be treated as Ctrl+Alt+.")),
             included: OS === OperatingSystem.Windows
         }
     }

package/vscode/src/vs/workbench/contrib/commands/common/commands.contribution.js

@@ -10,10 +10,10 @@ class RunCommands extends Action2 {
     constructor() {
         super({
             id: 'runCommands',
-            title: ( localize2(6134, "Run Commands")),
+            title: ( localize2(6257, "Run Commands")),
             f1: false,
             metadata: {
-                description: ( localize(6135, "Run several commands")),
+                description: ( localize(6258, "Run several commands")),
                 args: [
                     {
                         name: 'args',
@@ -23,7 +23,7 @@ class RunCommands extends Action2 {
                             properties: {
                                 commands: {
                                     type: 'array',
-                                    description: ( localize(6136, "Commands to run")),
+                                    description: ( localize(6259, "Commands to run")),
                                     items: {
                                         anyOf: [
                                             {
@@ -63,14 +63,14 @@ class RunCommands extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!this._isCommandArgs(args)) {
             notificationService.error(( localize(
-                6137,
+                6260,
                 "'runCommands' has received an argument with incorrect type. Please, review the argument passed to the command."
             )));
             return;
         }
         if (args.commands.length === 0) {
             notificationService.warn(( localize(
-                6138,
+                6261,
                 "'runCommands' has not received commands to run. Did you forget to pass commands in the 'runCommands' argument?"
             )));
             return;

package/vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js

@@ -15,7 +15,7 @@ class ToggleKeybindingsLogAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleKeybindingsLog',
-            title: ( localize2(8351, "Toggle Keyboard Shortcuts Troubleshooting")),
+            title: ( localize2(8477, "Toggle Keyboard Shortcuts Troubleshooting")),
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.js

@@ -10,21 +10,21 @@ import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core
 import { registerEditorContribution, EditorContributionInstantiation } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
 import { SnippetController2 } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/snippet/browser/snippetController2';
 import { SmartSnippetInserter } from '../common/smartSnippetInserter.js';
-import { DefineKeybindingOverlayWidget } from '@codingame/monaco-vscode-a3eaa464-944c-5b8f-8886-213068ba4897-common/vscode/vs/workbench/contrib/preferences/browser/keybindingWidgets';
+import { DefineKeybindingOverlayWidget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/preferences/browser/keybindingWidgets';
 import { parseTree } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
 import { WindowsNativeResolvedKeybinding } from '../../../services/keybinding/common/windowsKeyboardMapper.js';
 import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService';
 import { overviewRulerError, overviewRulerInfo } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editorColorRegistry';
 import { OverviewRulerLane, TrackedRangeStickiness } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
-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 { assertReturnsDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
-import { DEFINE_KEYBINDING_EDITOR_CONTRIB_ID } from '@codingame/monaco-vscode-2808e692-5fb9-54bf-bc21-1d3bff81e651-common/vscode/vs/workbench/services/preferences/common/preferences';
+import { DEFINE_KEYBINDING_EDITOR_CONTRIB_ID } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences';
 
 var KeybindingEditorDecorationsRenderer_1;
 const NLS_KB_LAYOUT_ERROR_MESSAGE = ( localize(
-    9706,
+    9841,
     "You won't be able to produce this key combination under your current keyboard layout."
 ));
 let DefineKeybindingEditorContribution = class DefineKeybindingEditorContribution extends Disposable {
@@ -182,14 +182,14 @@ let KeybindingEditorDecorationsRenderer = KeybindingEditorDecorationsRenderer_1
         else {
             if (usLabel && uiLabel !== usLabel) {
                 msg = ( new MarkdownString(( localize(
-                    9707,
+                    9842,
                     "**{0}** for your current keyboard layout (**{1}** for US standard).",
                     uiLabel,
                     usLabel
                 ))));
             }
             else {
-                msg = ( new MarkdownString(( localize(9708, "**{0}** for your current keyboard layout.", uiLabel))));
+                msg = ( new MarkdownString(( localize(9843, "**{0}** for your current keyboard layout.", uiLabel))));
             }
             className = 'keybindingInfo';
             overviewRulerColor = themeColorFromId(overviewRulerInfo);