@codingame/monaco-vscode-keybindings-service-override 25.1.2 → 26.0.1

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

@@ -71,8 +71,8 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
         this._mru = [];
         this._activeKeymapInfo = null;
         if (navigator.keyboard && navigator.keyboard.addEventListener) {
-            navigator.keyboard.addEventListener('layoutchange', () => {
-                this._getBrowserKeyMapping().then((mapping) => {
+            navigator.keyboard.addEventListener("layoutchange", () => {
+                this._getBrowserKeyMapping().then(mapping => {
                     if (this.isKeyMappingActive(mapping)) {
                         return;
                     }
@@ -80,8 +80,8 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
                 });
             });
         }
-        this._register(this._configurationService.onDidChangeConfiguration((e) => {
-            if (e.affectsConfiguration('keyboard')) {
+        this._register(this._configurationService.onDidChangeConfiguration(e => {
+            if (e.affectsConfiguration("keyboard")) {
                 this._keyboardMapper = null;
                 this._onDidChangeKeyboardMapper.fire();
             }
@@ -159,8 +159,7 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
             if (!this._activeKeymapInfo) {
                 this._activeKeymapInfo = matchedKeyboardLayout.result;
                 keymapUpdated = true;
-            }
-            else if (keymap) {
+            } else if (keymap) {
                 if (matchedKeyboardLayout.result.getScore(keymap) > this._activeKeymapInfo.getScore(keymap)) {
                     this._activeKeymapInfo = matchedKeyboardLayout.result;
                     keymapUpdated = true;
@@ -256,17 +255,17 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
         if (!currentKeymap) {
             return true;
         }
-        if (standardKeyboardEvent.browserEvent.key === 'Dead' || standardKeyboardEvent.browserEvent.isComposing) {
+        if (standardKeyboardEvent.browserEvent.key === "Dead" || standardKeyboardEvent.browserEvent.isComposing) {
             return true;
         }
         const mapping = currentKeymap.mapping[standardKeyboardEvent.code];
         if (!mapping) {
             return false;
         }
-        if (mapping.value === '') {
+        if (mapping.value === "") {
             if (keyboardEvent.ctrlKey || keyboardEvent.metaKey) {
                 setTimeout(() => {
-                    this._getBrowserKeyMapping().then((keymap) => {
+                    this._getBrowserKeyMapping().then(keymap => {
                         if (this.isKeyMappingActive(keymap)) {
                             return;
                         }
@@ -276,14 +275,9 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
             }
             return true;
         }
-        const expectedValue = standardKeyboardEvent.altKey && standardKeyboardEvent.shiftKey ? mapping.withShiftAltGr :
-            standardKeyboardEvent.altKey ? mapping.withAltGr :
-                standardKeyboardEvent.shiftKey ? mapping.withShift : mapping.value;
-        const isDead = (standardKeyboardEvent.altKey && standardKeyboardEvent.shiftKey && mapping.withShiftAltGrIsDeadKey) ||
-            (standardKeyboardEvent.altKey && mapping.withAltGrIsDeadKey) ||
-            (standardKeyboardEvent.shiftKey && mapping.withShiftIsDeadKey) ||
-            mapping.valueIsDeadKey;
-        if (isDead && standardKeyboardEvent.browserEvent.key !== 'Dead') {
+        const expectedValue = standardKeyboardEvent.altKey && standardKeyboardEvent.shiftKey ? mapping.withShiftAltGr : standardKeyboardEvent.altKey ? mapping.withAltGr : standardKeyboardEvent.shiftKey ? mapping.withShift : mapping.value;
+        const isDead = (standardKeyboardEvent.altKey && standardKeyboardEvent.shiftKey && mapping.withShiftAltGrIsDeadKey) || (standardKeyboardEvent.altKey && mapping.withAltGrIsDeadKey) || (standardKeyboardEvent.shiftKey && mapping.withShiftIsDeadKey) || mapping.valueIsDeadKey;
+        if (isDead && standardKeyboardEvent.browserEvent.key !== "Dead") {
             return false;
         }
         if (!isDead && standardKeyboardEvent.browserEvent.key !== expectedValue) {
@@ -294,20 +288,19 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
     async _getBrowserKeyMapping(keyboardEvent) {
         if (this.keyboardLayoutMapAllowed) {
             try {
-                return await navigator.keyboard.getLayoutMap().then((e) => {
+                return await navigator.keyboard.getLayoutMap().then(e => {
                     const ret = {};
                     for (const key of e) {
                         ret[key[0]] = {
-                            'value': key[1],
-                            'withShift': '',
-                            'withAltGr': '',
-                            'withShiftAltGr': ''
+                            "value": key[1],
+                            "withShift": "",
+                            "withAltGr": "",
+                            "withShiftAltGr": ""
                         };
                     }
                     return ret;
                 });
-            }
-            catch {
+            } catch {
                 this.keyboardLayoutMapAllowed = false;
             }
         }
@@ -315,10 +308,10 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
             const ret = {};
             const standardKeyboardEvent = keyboardEvent;
             ret[standardKeyboardEvent.browserEvent.code] = {
-                'value': standardKeyboardEvent.browserEvent.key,
-                'withShift': '',
-                'withAltGr': '',
-                'withShiftAltGr': ''
+                "value": standardKeyboardEvent.browserEvent.key,
+                "withShift": "",
+                "withAltGr": "",
+                "withShiftAltGr": ""
             };
             const matchedKeyboardLayout = this.getMatchedKeymapInfo(ret);
             if (matchedKeyboardLayout) {
@@ -332,15 +325,15 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
 class BrowserKeyboardMapperFactory extends BrowserKeyboardMapperFactoryBase {
     constructor(configurationService, notificationService, storageService, commandService) {
         super(configurationService);
-        const platform = isWindows ? 'win' : isMacintosh ? 'darwin' : 'linux';
-        __variableDynamicImportRuntime0__(`./keyboardLayouts/layout.contribution.${platform}.js`).then((m) => {
+        const platform = isWindows ? "win" : isMacintosh ? "darwin" : "linux";
+        __variableDynamicImportRuntime0__(`./keyboardLayouts/layout.contribution.${platform}.js`).then(m => {
             const keymapInfos = m.KeyboardLayoutContribution.INSTANCE.layoutInfos;
-            this._keymapInfos.push(...( keymapInfos.map(info => (( new KeymapInfo(
+            this._keymapInfos.push(...( keymapInfos.map(info => ( new KeymapInfo(
                 info.layout,
                 info.secondaryLayouts,
                 info.mapping,
                 info.isUserKeyboardLayout
-            ))))));
+            )))));
             this._mru = this._keymapInfos;
             this._initialized = true;
             this.setLayoutFromBrowserAPI();
@@ -348,7 +341,9 @@ class BrowserKeyboardMapperFactory extends BrowserKeyboardMapperFactoryBase {
     }
 }
 class UserKeyboardLayout extends Disposable {
-    get keyboardLayout() { return this._keyboardLayout; }
+    get keyboardLayout() {
+        return this._keyboardLayout;
+    }
     constructor(keyboardLayoutResource, fileService) {
         super();
         this.keyboardLayoutResource = keyboardLayoutResource;
@@ -361,7 +356,10 @@ class UserKeyboardLayout extends Disposable {
                 this._onDidChange.fire();
             }
         }), 50)));
-        this._register(Event.filter(this.fileService.onDidFilesChange, e => e.contains(this.keyboardLayoutResource))(() => this.reloadConfigurationScheduler.schedule()));
+        this._register(Event.filter(
+            this.fileService.onDidFilesChange,
+            e => e.contains(this.keyboardLayoutResource)
+        )(() => this.reloadConfigurationScheduler.schedule()));
     }
     async initialize() {
         await this.reload();
@@ -371,46 +369,50 @@ class UserKeyboardLayout extends Disposable {
         try {
             const content = await this.fileService.readFile(this.keyboardLayoutResource);
             const value = parse(( content.value.toString()));
-            if (getNodeType(value) === 'object') {
+            if (getNodeType(value) === "object") {
                 const layoutInfo = value.layout;
                 const mappings = value.rawMapping;
                 this._keyboardLayout = KeymapInfo.createKeyboardLayoutFromDebugInfo(layoutInfo, mappings, true);
-            }
-            else {
+            } else {
                 this._keyboardLayout = null;
             }
-        }
-        catch (e) {
+        } catch (e) {
             this._keyboardLayout = null;
         }
         return existing ? !equals(existing, this._keyboardLayout) : true;
     }
 }
 let BrowserKeyboardLayoutService = class BrowserKeyboardLayoutService extends Disposable {
-    constructor(environmentService, fileService, notificationService, storageService, commandService, configurationService) {
+    constructor(
+        environmentService,
+        fileService,
+        notificationService,
+        storageService,
+        commandService,
+        configurationService
+    ) {
         super();
         this.configurationService = configurationService;
         this._onDidChangeKeyboardLayout = ( new Emitter());
         this.onDidChangeKeyboardLayout = this._onDidChangeKeyboardLayout.event;
-        const keyboardConfig = configurationService.getValue('keyboard');
+        const keyboardConfig = configurationService.getValue("keyboard");
         const layout = keyboardConfig.layout;
-        this._keyboardLayoutMode = layout ?? 'autodetect';
+        this._keyboardLayoutMode = layout ?? "autodetect";
         this._factory = ( new BrowserKeyboardMapperFactory(configurationService, notificationService, storageService, commandService));
         this._register(this._factory.onDidChangeKeyboardMapper(() => {
             this._onDidChangeKeyboardLayout.fire();
         }));
-        if (layout && layout !== 'autodetect') {
+        if (layout && layout !== "autodetect") {
             this._factory.setKeyboardLayout(layout);
         }
         this._register(configurationService.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration('keyboard.layout')) {
-                const keyboardConfig = configurationService.getValue('keyboard');
+            if (e.affectsConfiguration("keyboard.layout")) {
+                const keyboardConfig = configurationService.getValue("keyboard");
                 const layout = keyboardConfig.layout;
                 this._keyboardLayoutMode = layout;
-                if (layout === 'autodetect') {
+                if (layout === "autodetect") {
                     this._factory.setLayoutFromBrowserAPI();
-                }
-                else {
+                } else {
                     this._factory.setKeyboardLayout(layout);
                 }
             }
@@ -427,12 +429,10 @@ let BrowserKeyboardLayoutService = class BrowserKeyboardLayoutService extends Di
             if (userKeyboardLayouts.length) {
                 if (this._userKeyboardLayout.keyboardLayout) {
                     userKeyboardLayouts[0].update(this._userKeyboardLayout.keyboardLayout);
-                }
-                else {
+                } else {
                     this._factory.removeKeyboardLayout(userKeyboardLayouts[0]);
                 }
-            }
-            else {
+            } else {
                 if (this._userKeyboardLayout.keyboardLayout) {
                     this._factory.registerKeyboardLayout(this._userKeyboardLayout.keyboardLayout);
                 }
@@ -441,7 +441,7 @@ let BrowserKeyboardLayoutService = class BrowserKeyboardLayoutService extends Di
         }));
     }
     setUserKeyboardLayoutIfMatched() {
-        const keyboardConfig = this.configurationService.getValue('keyboard');
+        const keyboardConfig = this.configurationService.getValue("keyboard");
         const layout = keyboardConfig.layout;
         if (layout && this._userKeyboardLayout.keyboardLayout) {
             if (getKeyboardLayoutId(this._userKeyboardLayout.keyboardLayout.layout) === layout && this._factory.activeKeymap) {
@@ -464,31 +464,24 @@ let BrowserKeyboardLayoutService = class BrowserKeyboardLayoutService extends Di
         return this._factory.activeKeyMapping;
     }
     validateCurrentKeyboardMapping(keyboardEvent) {
-        if (this._keyboardLayoutMode !== 'autodetect') {
+        if (this._keyboardLayoutMode !== "autodetect") {
             return;
         }
         this._factory.validateCurrentKeyboardMapping(keyboardEvent);
     }
 };
-BrowserKeyboardLayoutService = ( __decorate([
-    ( __param(0, IEnvironmentService)),
-    ( __param(1, IFileService)),
-    ( __param(2, INotificationService)),
-    ( __param(3, IStorageService)),
-    ( __param(4, ICommandService)),
-    ( __param(5, IConfigurationService))
-], BrowserKeyboardLayoutService));
+BrowserKeyboardLayoutService = ( __decorate([( __param(0, IEnvironmentService)), ( __param(1, IFileService)), ( __param(2, INotificationService)), ( __param(3, IStorageService)), ( __param(4, ICommandService)), ( __param(5, IConfigurationService))], BrowserKeyboardLayoutService));
 const configurationRegistry = ( Registry.as(Extensions.Configuration));
 const keyboardConfiguration = {
-    'id': 'keyboard',
-    'order': 15,
-    'type': 'object',
-    'title': ( localize(14136, "Keyboard")),
-    'properties': {
-        'keyboard.layout': {
-            'type': 'string',
-            'default': 'autodetect',
-            'description': ( localize(14137, "Control the keyboard layout used in web."))
+    "id": "keyboard",
+    "order": 15,
+    "type": "object",
+    "title": ( localize(14525, "Keyboard")),
+    "properties": {
+        "keyboard.layout": {
+            "type": "string",
+            "default": "autodetect",
+            "description": ( localize(14526, "Control the keyboard layout used in web."))
         }
     }
 };

package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution.js

@@ -1,7 +1,9 @@
 
 
 class KeyboardLayoutContribution {
-    static { this.INSTANCE = ( new KeyboardLayoutContribution()); }
+    static {
+        this.INSTANCE = ( new KeyboardLayoutContribution());
+    }
     get layoutInfos() {
         return this._layoutInfos;
     }

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

@@ -8,67 +8,62 @@ class KeybindingIO {
             return;
         }
         const quotedSerializedKeybinding = JSON.stringify(item.resolvedKeybinding.getUserSettingsLabel());
-        out.write(`{ "key": ${rightPaddedString(quotedSerializedKeybinding + ',', 25)} "command": `);
-        const quotedSerializedWhen = item.when ? JSON.stringify(item.when.serialize()) : '';
+        out.write(
+            `{ "key": ${rightPaddedString(quotedSerializedKeybinding + ",", 25)} "command": `
+        );
+        const quotedSerializedWhen = item.when ? JSON.stringify(item.when.serialize()) : "";
         const quotedSerializeCommand = JSON.stringify(item.command);
         if (quotedSerializedWhen.length > 0) {
             out.write(`${quotedSerializeCommand},`);
             out.writeLine();
             out.write(`                                     "when": ${quotedSerializedWhen}`);
-        }
-        else {
+        } else {
             out.write(`${quotedSerializeCommand}`);
         }
         if (item.commandArgs) {
-            out.write(',');
+            out.write(",");
             out.writeLine();
-            out.write(`                                     "args": ${JSON.stringify(item.commandArgs)}`);
+            out.write(
+                `                                     "args": ${JSON.stringify(item.commandArgs)}`
+            );
         }
-        out.write(' }');
+        out.write(" }");
     }
     static readUserKeybindingItem(input) {
-        const keybinding = 'key' in input && typeof input.key === 'string'
-            ? KeybindingParser.parseKeybinding(input.key)
-            : null;
-        const when = 'when' in input && typeof input.when === 'string'
-            ? ContextKeyExpr.deserialize(input.when)
-            : undefined;
-        const command = 'command' in input && typeof input.command === 'string'
-            ? input.command
-            : null;
-        const commandArgs = 'args' in input && typeof input.args !== 'undefined'
-            ? input.args
-            : undefined;
+        const keybinding = "key" in input && typeof input.key === "string" ? KeybindingParser.parseKeybinding(input.key) : null;
+        const when = "when" in input && typeof input.when === "string" ? ContextKeyExpr.deserialize(input.when) : undefined;
+        const command = "command" in input && typeof input.command === "string" ? input.command : null;
+        const commandArgs = "args" in input && typeof input.args !== "undefined" ? input.args : undefined;
         return {
             keybinding,
             command,
             commandArgs,
             when,
-            _sourceKey: 'key' in input && typeof input.key === 'string' ? input.key : undefined,
+            _sourceKey: "key" in input && typeof input.key === "string" ? input.key : undefined
         };
     }
 }
 function rightPaddedString(str, minChars) {
     if (str.length < minChars) {
-        return str + (( new Array(minChars - str.length)).join(' '));
+        return str + (( new Array(minChars - str.length)).join(" "));
     }
     return str;
 }
 class OutputBuilder {
     constructor() {
         this._lines = [];
-        this._currentLine = '';
+        this._currentLine = "";
     }
     write(str) {
         this._currentLine += str;
     }
-    writeLine(str = '') {
+    writeLine(str = "") {
         this._lines.push(this._currentLine + str);
-        this._currentLine = '';
+        this._currentLine = "";
     }
     toString() {
         this.writeLine();
-        return this._lines.join('\n');
+        return this._lines.join("\n");
     }
 }
 

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

@@ -15,27 +15,26 @@ function deserializeMapping(serializedMapping) {
             const mask = Number(result[4]);
             const vkey = result.length === 6 ? result[5] : undefined;
             ret[key] = {
-                'value': value,
-                'vkey': vkey,
-                'withShift': withShift,
-                'withAltGr': withAltGr,
-                'withShiftAltGr': withShiftAltGr,
-                'valueIsDeadKey': (mask & 1) > 0,
-                'withShiftIsDeadKey': (mask & 2) > 0,
-                'withAltGrIsDeadKey': (mask & 4) > 0,
-                'withShiftAltGrIsDeadKey': (mask & 8) > 0
+                "value": value,
+                "vkey": vkey,
+                "withShift": withShift,
+                "withAltGr": withAltGr,
+                "withShiftAltGr": withShiftAltGr,
+                "valueIsDeadKey": (mask & 1) > 0,
+                "withShiftIsDeadKey": (mask & 2) > 0,
+                "withAltGrIsDeadKey": (mask & 4) > 0,
+                "withShiftAltGrIsDeadKey": (mask & 8) > 0
             };
-        }
-        else {
+        } else {
             ret[key] = {
-                'value': '',
-                'valueIsDeadKey': false,
-                'withShift': '',
-                'withShiftIsDeadKey': false,
-                'withAltGr': '',
-                'withAltGrIsDeadKey': false,
-                'withShiftAltGr': '',
-                'withShiftAltGrIsDeadKey': false
+                "value": "",
+                "valueIsDeadKey": false,
+                "withShift": "",
+                "withShiftIsDeadKey": false,
+                "withAltGr": "",
+                "withAltGrIsDeadKey": false,
+                "withShiftAltGr": "",
+                "withShiftAltGrIsDeadKey": false
             };
         }
     }
@@ -64,10 +63,10 @@ class KeymapInfo {
     getScore(other) {
         let score = 0;
         for (const key in other) {
-            if (isWindows && (key === 'Backslash' || key === 'KeyQ')) {
+            if (isWindows && (key === "Backslash" || key === "KeyQ")) {
                 continue;
             }
-            if (isLinux && (key === 'Backspace' || key === 'Escape')) {
+            if (isLinux && (key === "Backspace" || key === "Escape")) {
                 continue;
             }
             const currentMapping = this.mapping[key];
@@ -92,7 +91,7 @@ class KeymapInfo {
     }
     fuzzyEqual(other) {
         for (const key in other) {
-            if (isWindows && (key === 'Backslash' || key === 'KeyQ')) {
+            if (isWindows && (key === "Backslash" || key === "KeyQ")) {
                 continue;
             }
             if (this.mapping[key] === undefined) {