@codingame/monaco-vscode-api 1.81.8-next.2 → 1.81.8-next.3

package/extensions.d.ts

@@ -17,6 +17,7 @@ interface RegisterRemoteExtensionParams extends RegisterExtensionParams {
 interface RegisterExtensionResult {
     id: string;
     dispose(): Promise<void>;
+    whenReady(): Promise<void>;
 }
 interface RegisterRemoteExtensionResult extends RegisterExtensionResult {
 }

package/extensions.js

@@ -82,6 +82,9 @@ function registerExtension(manifest, extHostKind, { defaultNLS, builtin = manife
     })();
     let api = {
         id,
+        async whenReady() {
+            await addExtensionPromise;
+        },
         async dispose() {
             const extension = await addExtensionPromise;
             await deltaExtensions([], [extension]);

package/monaco.js

@@ -148,6 +148,9 @@ let DelegateStandaloneKeybindingService = class DelegateStandaloneKeybindingServ
     _getResolver() {
         return this.delegate._getResolver();
     }
+    resolveKeyboardEvent(keyboardEvent) {
+        return this.delegate.resolveKeyboardEvent(keyboardEvent);
+    }
 };
 DelegateStandaloneKeybindingService = __decorate([
     ( __param(1, IContextKeyService)),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "1.81.8-next.2",
+  "version": "1.81.8-next.3",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {

package/service-override/keybindings.d.ts

@@ -2,6 +2,9 @@ export { IUserFriendlyKeybinding } from '../vscode/src/vs/platform/keybinding/co
 import { IEditorOverrideServices } from '../vscode/src/vs/editor/standalone/browser/standaloneServices.js';
 
 declare function updateUserKeybindings(keybindingsJson: string): Promise<void>;
-declare function getServiceOverride(): IEditorOverrideServices;
+interface KeybindingsProps {
+    shouldUseGlobalKeybindings?: () => boolean;
+}
+declare function getServiceOverride({ shouldUseGlobalKeybindings }?: KeybindingsProps): IEditorOverrideServices;
 
 export { getServiceOverride as default, updateUserKeybindings };

package/service-override/keybindings.js

@@ -1,3 +1,4 @@
+import { __decorate, __param } from '../external/tslib/tslib.es6.js';
 import '../missing-services.js';
 import { StandaloneServices } from 'monaco-editor/esm/vs/editor/standalone/browser/standaloneServices.js';
 import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
@@ -11,6 +12,14 @@ import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.j
 import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { CommandService } from '../vscode/src/vs/workbench/services/commands/common/commandService.js';
 import { toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
+import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
+import { IUserDataProfileService } from '../vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js';
+import { IHostService } from '../vscode/src/vs/workbench/services/host/browser/host.js';
+import { IExtensionService } from '../vscode/src/vs/workbench/services/extensions/common/extensions.js';
+import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
 import getServiceOverride$1 from './files.js';
 import '../vscode/src/vs/workbench/browser/workbench.contribution.js';
 import '../vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js';
@@ -18,9 +27,10 @@ async function updateUserKeybindings(keybindingsJson) {
     const userDataProfilesService = StandaloneServices.get(IUserDataProfilesService);
     await StandaloneServices.get(IFileService).writeFile(userDataProfilesService.defaultProfile.keybindingsResource, VSBuffer.fromString(keybindingsJson));
 }
-class DynamicWorkbenchKeybindingService extends WorkbenchKeybindingService {
-    constructor() {
-        super(...arguments);
+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);
+        this.shouldUseGlobalKeybindings = shouldUseGlobalKeybindings;
         this.keybindingProviders = [];
     }
     registerKeybindingProvider(provider) {
@@ -37,14 +47,33 @@ class DynamicWorkbenchKeybindingService extends WorkbenchKeybindingService {
     _getResolver() {
         return super._getResolver();
     }
+    _dispatch(e, target) {
+        if (!this.shouldUseGlobalKeybindings()) {
+            return false;
+        }
+        return super._dispatch(e, target);
+    }
     getUserKeybindingItems() {
         return [...super.getUserKeybindingItems(), ...this.keybindingProviders.flatMap(provider => provider())];
     }
-}
-function getServiceOverride() {
+};
+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))
+], DynamicWorkbenchKeybindingService);
+function getServiceOverride({ shouldUseGlobalKeybindings = () => false } = {}) {
     return {
         ...getServiceOverride$1(),
-        [( IKeybindingService.toString())]: new SyncDescriptor(DynamicWorkbenchKeybindingService, [], false),
+        [( IKeybindingService.toString())]: new SyncDescriptor(DynamicWorkbenchKeybindingService, [shouldUseGlobalKeybindings], false),
         [( IKeyboardLayoutService.toString())]: new SyncDescriptor(BrowserKeyboardLayoutService, undefined, true),
         [( ICommandService.toString())]: new SyncDescriptor(CommandService, [], true)
     };

package/service-override/views.js

@@ -89,6 +89,7 @@ import { MonacoEditorService, MonacoDelegateEditorGroupsService } from './tools/
 import getServiceOverride$2 from './bulkEdit.js';
 import getServiceOverride$1 from './layout.js';
 import getServiceOverride$3 from './quickaccess.js';
+import getServiceOverride$4 from './keybindings.js';
 import { changeUrlDomain } from './tools/url.js';
 import { registerAssets } from '../assets.js';
 import { registerServiceInitializePostParticipant } from '../lifecycle.js';
@@ -473,6 +474,9 @@ function getServiceOverride(openEditorFallback, _webviewIframeAlternateDomains)
             isKeybindingConfigurationVisible: isEditorPartVisible,
             shouldUseGlobalPicker: isEditorPartVisible
         }),
+        ...getServiceOverride$4({
+            shouldUseGlobalKeybindings: isEditorPartVisible
+        }),
         [( IViewsService.toString())]: new SyncDescriptor(ViewsService, [], false),
         [( IViewDescriptorService.toString())]: new SyncDescriptor(ViewDescriptorService, [], true),
         [( IActivityService.toString())]: new SyncDescriptor(ActivityService, [], true),