@codingame/monaco-vscode-keybindings-service-override 2.1.3 → 2.2.0-next.1

package/keybindings.js

@@ -1,5 +1,4 @@
 import { __decorate, __param } from './external/tslib/tslib.es6.js';
-import { StandaloneServices } from 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { WorkbenchKeybindingService } from './vscode/src/vs/workbench/services/keybinding/browser/keybindingService.js';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
@@ -28,14 +27,16 @@ import { onRenderWorkbench } from 'vscode/lifecycle';
 import 'vscode/vscode/vs/workbench/browser/workbench.contribution';
 import './vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js';
 import './vscode/src/vs/workbench/contrib/commands/common/commands.contribution.js';
+import { getService } from 'vscode/services';
 
 const defaultUserKeybindindsFile = ( URI.from({ scheme: Schemas.vscodeUserData, path: '/User/keybindings.json' }));
 async function initUserKeybindings(configurationJson, options, file = defaultUserKeybindindsFile) {
     await initFile(file, configurationJson, options);
 }
 async function updateUserKeybindings(keybindingsJson) {
-    const userDataProfilesService = StandaloneServices.get(IUserDataProfilesService);
-    await StandaloneServices.get(IFileService).writeFile(userDataProfilesService.defaultProfile.keybindingsResource, VSBuffer.fromString(keybindingsJson));
+    const userDataProfilesService = await getService(IUserDataProfilesService);
+    const fileService = await getService(IFileService);
+    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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-keybindings-service-override",
-  "version": "2.1.3",
+  "version": "2.2.0-next.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,8 +18,14 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.1.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.2.0-next.1",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-files-service-override": "2.1.3"
+    "@codingame/monaco-vscode-files-service-override": "2.2.0-next.1",
+    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.0-next.1",
+    "@codingame/monaco-vscode-extensions-service-override": "2.2.0-next.1",
+    "@codingame/monaco-vscode-environment-service-override": "2.2.0-next.1",
+    "@codingame/monaco-vscode-layout-service-override": "2.2.0-next.1",
+    "@codingame/monaco-vscode-host-service-override": "2.2.0-next.1",
+    "@codingame/monaco-vscode-base-service-override": "2.2.0-next.1"
   }
 }

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

@@ -8,7 +8,7 @@ import { DeferredPromise, RunOnceScheduler } from 'vscode/vscode/vs/base/common/
 import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { parse } from 'vscode/vscode/vs/base/common/json';
 import { UserSettingsLabelProvider } from 'vscode/vscode/vs/base/common/keybindingLabels';
-import { KeybindingParser } from '../../../../base/common/keybindingParser.js';
+import { KeybindingParser } from 'vscode/vscode/vs/base/common/keybindingParser';
 import { KeyCodeChord, ScanCodeChord } from 'vscode/vscode/vs/base/common/keybindings';
 import { KeyCodeUtils, ScanCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE } from 'vscode/vscode/vs/base/common/keyCodes';
 import { DisposableStore, Disposable } from 'vscode/vscode/vs/base/common/lifecycle';

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

@@ -61,6 +61,7 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
         this._configurationService = _configurationService;
         this._onDidChangeKeyboardMapper = ( new Emitter());
         this.onDidChangeKeyboardMapper = this._onDidChangeKeyboardMapper.event;
+        this.keyboardLayoutMapAllowed = navigator.keyboard !== undefined;
         this._keyboardMapper = null;
         this._initialized = false;
         this._keymapInfos = [];
@@ -288,7 +289,7 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
         return true;
     }
     async _getBrowserKeyMapping(keyboardEvent) {
-        if (navigator.keyboard) {
+        if (this.keyboardLayoutMapAllowed) {
             try {
                 return await navigator.keyboard.getLayoutMap().then((e) => {
                     const ret = {};
@@ -304,9 +305,10 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
                 });
             }
             catch {
+                this.keyboardLayoutMapAllowed = false;
             }
         }
-        else if (keyboardEvent && !keyboardEvent.shiftKey && !keyboardEvent.altKey && !keyboardEvent.metaKey && !keyboardEvent.metaKey) {
+        if (keyboardEvent && !keyboardEvent.shiftKey && !keyboardEvent.altKey && !keyboardEvent.metaKey && !keyboardEvent.metaKey) {
             const ret = {};
             const standardKeyboardEvent = keyboardEvent;
             ret[standardKeyboardEvent.browserEvent.code] = {

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

@@ -1,4 +1,4 @@
-import { KeybindingParser } from '../../../../base/common/keybindingParser.js';
+import { KeybindingParser } from 'vscode/vscode/vs/base/common/keybindingParser';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 
 class KeybindingIO {

package/vscode/src/vs/base/common/keybindingParser.js

@@ -1,89 +0,0 @@
-import { ScanCodeUtils, KeyCodeUtils } from 'vscode/vscode/vs/base/common/keyCodes';
-import { ScanCodeChord, KeyCodeChord, Keybinding } from 'vscode/vscode/vs/base/common/keybindings';
-
-class KeybindingParser {
-    static _readModifiers(input) {
-        input = input.toLowerCase().trim();
-        let ctrl = false;
-        let shift = false;
-        let alt = false;
-        let meta = false;
-        let matchedModifier;
-        do {
-            matchedModifier = false;
-            if (/^ctrl(\+|\-)/.test(input)) {
-                ctrl = true;
-                input = input.substr('ctrl-'.length);
-                matchedModifier = true;
-            }
-            if (/^shift(\+|\-)/.test(input)) {
-                shift = true;
-                input = input.substr('shift-'.length);
-                matchedModifier = true;
-            }
-            if (/^alt(\+|\-)/.test(input)) {
-                alt = true;
-                input = input.substr('alt-'.length);
-                matchedModifier = true;
-            }
-            if (/^meta(\+|\-)/.test(input)) {
-                meta = true;
-                input = input.substr('meta-'.length);
-                matchedModifier = true;
-            }
-            if (/^win(\+|\-)/.test(input)) {
-                meta = true;
-                input = input.substr('win-'.length);
-                matchedModifier = true;
-            }
-            if (/^cmd(\+|\-)/.test(input)) {
-                meta = true;
-                input = input.substr('cmd-'.length);
-                matchedModifier = true;
-            }
-        } while (matchedModifier);
-        let key;
-        const firstSpaceIdx = input.indexOf(' ');
-        if (firstSpaceIdx > 0) {
-            key = input.substring(0, firstSpaceIdx);
-            input = input.substring(firstSpaceIdx);
-        }
-        else {
-            key = input;
-            input = '';
-        }
-        return {
-            remains: input,
-            ctrl,
-            shift,
-            alt,
-            meta,
-            key
-        };
-    }
-    static parseChord(input) {
-        const mods = this._readModifiers(input);
-        const scanCodeMatch = mods.key.match(/^\[([^\]]+)\]$/);
-        if (scanCodeMatch) {
-            const strScanCode = scanCodeMatch[1];
-            const scanCode = ScanCodeUtils.lowerCaseToEnum(strScanCode);
-            return [( new ScanCodeChord(mods.ctrl, mods.shift, mods.alt, mods.meta, scanCode)), mods.remains];
-        }
-        const keyCode = KeyCodeUtils.fromUserSettings(mods.key);
-        return [( new KeyCodeChord(mods.ctrl, mods.shift, mods.alt, mods.meta, keyCode)), mods.remains];
-    }
-    static parseKeybinding(input) {
-        if (!input) {
-            return null;
-        }
-        const chords = [];
-        let chord;
-        while (input.length > 0) {
-            [chord, input] = this.parseChord(input);
-            chords.push(chord);
-        }
-        return (chords.length > 0 ? ( new Keybinding(chords)) : null);
-    }
-}
-
-export { KeybindingParser };