@codingame/monaco-vscode-keybindings-service-override 16.0.6 → 16.1.0

package/index.js

@@ -31,6 +31,7 @@ import './vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contri
 import './vscode/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.js';
 import './vscode/src/vs/workbench/contrib/commands/common/commands.contribution.js';
 import { getService } from '@codingame/monaco-vscode-api/services';
+import { ILayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/layout/browser/layoutService.service';
 
 const defaultUserKeybindindsFile = URI.from({
     scheme: Schemas.vscodeUserData,
@@ -45,8 +46,8 @@ 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) {
-        super(contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService);
+    constructor(shouldUseGlobalKeybindings, contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService, layoutService) {
+        super(contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService, layoutService);
         this.shouldUseGlobalKeybindings = shouldUseGlobalKeybindings;
         this.keybindingProviders = [];
     }
@@ -93,7 +94,8 @@ DynamicWorkbenchKeybindingService = __decorate([
     __param(8, IFileService),
     __param(9, IUriIdentityService),
     __param(10, ILogService),
-    __param(11, IKeyboardLayoutService)
+    __param(11, IKeyboardLayoutService),
+    __param(12, ILayoutService)
 ], DynamicWorkbenchKeybindingService);
 onRenderWorkbench((accessor) => {
     accessor.get(IInstantiationService).createInstance(WorkbenchContextKeysHandler);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-keybindings-service-override",
-  "version": "16.0.6",
+  "version": "16.1.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - keybindings service-override",
   "keywords": [],
@@ -15,14 +15,15 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-2a22c7b4-b906-5914-8cd1-3ed912fb738f-common": "16.0.6",
-    "@codingame/monaco-vscode-2b1a9082-790f-527f-b013-d1b29d6265a3-common": "16.0.6",
-    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "16.0.6",
-    "@codingame/monaco-vscode-7559b0be-bfa5-5fe6-b731-1973fe9fffa1-common": "16.0.6",
-    "@codingame/monaco-vscode-api": "16.0.6",
-    "@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common": "16.0.6",
-    "@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common": "16.0.6",
-    "@codingame/monaco-vscode-files-service-override": "16.0.6"
+    "@codingame/monaco-vscode-2a22c7b4-b906-5914-8cd1-3ed912fb738f-common": "16.1.0",
+    "@codingame/monaco-vscode-2b1a9082-790f-527f-b013-d1b29d6265a3-common": "16.1.0",
+    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "16.1.0",
+    "@codingame/monaco-vscode-4893679b-56e5-52c5-a8fb-c366cce9660f-common": "16.1.0",
+    "@codingame/monaco-vscode-7559b0be-bfa5-5fe6-b731-1973fe9fffa1-common": "16.1.0",
+    "@codingame/monaco-vscode-a3eaa464-944c-5b8f-8886-213068ba4897-common": "16.1.0",
+    "@codingame/monaco-vscode-api": "16.1.0",
+    "@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common": "16.1.0",
+    "@codingame/monaco-vscode-files-service-override": "16.1.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/workbench/browser/contextkeys.js

@@ -13,7 +13,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
 import { WorkbenchState, isTemporaryWorkspace } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
-import { positionToString, Parts } from '@codingame/monaco-vscode-b1110435-a331-5549-ab1e-aa3d763c3a1f-common/vscode/vs/workbench/services/layout/browser/layoutService';
+import { positionToString, Parts } from '@codingame/monaco-vscode-4893679b-56e5-52c5-a8fb-c366cce9660f-common/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { getRemoteName } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteHosts';
 import { getVirtualWorkspaceScheme } from '@codingame/monaco-vscode-7559b0be-bfa5-5fe6-b731-1973fe9fffa1-common/vscode/vs/platform/workspace/common/virtualWorkspace';

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

@@ -10,7 +10,7 @@ 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-d609a7d3-bf87-551a-884f-550a8b327ec5-common/vscode/vs/workbench/contrib/preferences/browser/keybindingWidgets';
+import { DefineKeybindingOverlayWidget } from '@codingame/monaco-vscode-a3eaa464-944c-5b8f-8886-213068ba4897-common/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';

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

@@ -14,9 +14,11 @@ 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;
@@ -24,7 +26,7 @@ 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);
+    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);
     private _registerKeyListeners;
     registerSchemaContribution(contribution: KeybindingsSchemaContribution): void;
     private updateKeybindingsJsonSchema;

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

@@ -45,6 +45,7 @@ import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/s
 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';
 
 var WorkbenchKeybindingService_1;
 function isValidContributedKeyBinding(keyBinding, rejects) {
@@ -165,10 +166,11 @@ 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) {
+    constructor(contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService, layoutService) {
         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,7 +223,8 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
     }
     _registerKeyListeners(window) {
         const disposables = ( new DisposableStore());
-        disposables.add(addDisposableListener(window, EventType.KEY_DOWN, (e) => {
+        const container = this.layoutService.getContainer(window);
+        disposables.add(addDisposableListener(container, EventType.KEY_DOWN, (e) => {
             if (this._keybindingHoldMode) {
                 return;
             }
@@ -235,7 +238,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
             }
             this.isComposingGlobalContextKey.set(false);
         }));
-        disposables.add(addDisposableListener(window, EventType.KEY_UP, (e) => {
+        disposables.add(addDisposableListener(container, EventType.KEY_UP, (e) => {
             this._resetKeybindingHoldMode();
             this.isComposingGlobalContextKey.set(e.isComposing);
             const keyEvent = ( new StandardKeyboardEvent(e));
@@ -638,7 +641,8 @@ WorkbenchKeybindingService = WorkbenchKeybindingService_1 = ( __decorate([
     ( __param(7, IFileService)),
     ( __param(8, IUriIdentityService)),
     ( __param(9, ILogService)),
-    ( __param(10, IKeyboardLayoutService))
+    ( __param(10, IKeyboardLayoutService)),
+    ( __param(11, ILayoutService))
 ], WorkbenchKeybindingService));
 class UserKeybindings extends Disposable {
     get keybindings() { return this._keybindings; }