@codingame/monaco-vscode-keybindings-service-override 9.0.3 → 10.0.1

package/vscode/src/vs/workbench/services/commands/common/commandService.js

@@ -5,7 +5,6 @@ import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extension
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { timeout } from 'vscode/vscode/vs/base/common/async';
 
 let CommandService = class CommandService extends Disposable {

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

@@ -1,7 +1,7 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize } from 'vscode/vscode/vs/nls';
 import { onDidChangeFullscreen, isFullscreen } from 'vscode/vscode/vs/base/browser/browser';
-import { BrowserFeatures, KeyboardSupport } from 'vscode/vscode/vs/base/browser/canIUse';
+import { BrowserFeatures } from 'vscode/vscode/vs/base/browser/canIUse';
 import { onDidRegisterWindow, addDisposableListener, EventType, trackFocus, getWindow } from 'vscode/vscode/vs/base/browser/dom';
 import { StandardKeyboardEvent, printKeyboardEvent, printStandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
 import { DeferredPromise, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
@@ -10,10 +10,10 @@ import { parse } from 'vscode/vscode/vs/base/common/json';
 import { UserSettingsLabelProvider } from 'vscode/vscode/vs/base/common/keybindingLabels';
 import { KeybindingParser } from 'vscode/vscode/vs/base/common/keybindingParser';
 import { KeyCodeChord, ScanCodeChord } from 'vscode/vscode/vs/base/common/keybindings';
-import { ScanCode, KeyCode, KeyCodeUtils, ScanCodeUtils, KeyMod, IMMUTABLE_CODE_TO_KEY_CODE } from 'vscode/vscode/vs/base/common/keyCodes';
+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';
 import { equals } from 'vscode/vscode/vs/base/common/objects';
-import { OS, OperatingSystem, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
+import { OS, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { dirname } from 'vscode/vscode/vs/base/common/resources';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { MenuRegistry } from 'vscode/vscode/vs/platform/actions/common/actions';
@@ -21,14 +21,12 @@ import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/comm
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
-import { FileOperation } from 'vscode/vscode/vs/platform/files/common/files';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { AbstractKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/abstractKeybindingService';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { KeybindingResolver } from 'vscode/vscode/vs/platform/keybinding/common/keybindingResolver';
-import { KeybindingsRegistry, KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ResolvedKeybindingItem } from 'vscode/vscode/vs/platform/keybinding/common/resolvedKeybindingItem';
 import { IKeyboardLayoutService } from 'vscode/vscode/vs/platform/keyboardLayout/common/keyboardLayout.service';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
@@ -48,35 +46,35 @@ import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/use
 var WorkbenchKeybindingService_1;
 function isValidContributedKeyBinding(keyBinding, rejects) {
     if (!keyBinding) {
-        rejects.push(( localize(3501, "expected non-empty value.")));
+        rejects.push(( localize(3537, "expected non-empty value.")));
         return false;
     }
     if (typeof keyBinding.command !== 'string') {
         rejects.push(( localize(
-            3502,
+            3538,
             "property `{0}` is mandatory and must be of type `string`",
             'command'
         )));
         return false;
     }
     if (keyBinding.key && typeof keyBinding.key !== 'string') {
-        rejects.push(( localize(3503, "property `{0}` can be omitted or must be of type `string`", 'key')));
+        rejects.push(( localize(3539, "property `{0}` can be omitted or must be of type `string`", 'key')));
         return false;
     }
     if (keyBinding.when && typeof keyBinding.when !== 'string') {
-        rejects.push(( localize(3503, "property `{0}` can be omitted or must be of type `string`", 'when')));
+        rejects.push(( localize(3539, "property `{0}` can be omitted or must be of type `string`", 'when')));
         return false;
     }
     if (keyBinding.mac && typeof keyBinding.mac !== 'string') {
-        rejects.push(( localize(3503, "property `{0}` can be omitted or must be of type `string`", 'mac')));
+        rejects.push(( localize(3539, "property `{0}` can be omitted or must be of type `string`", 'mac')));
         return false;
     }
     if (keyBinding.linux && typeof keyBinding.linux !== 'string') {
-        rejects.push(( localize(3503, "property `{0}` can be omitted or must be of type `string`", 'linux')));
+        rejects.push(( localize(3539, "property `{0}` can be omitted or must be of type `string`", 'linux')));
         return false;
     }
     if (keyBinding.win && typeof keyBinding.win !== 'string') {
-        rejects.push(( localize(3503, "property `{0}` can be omitted or must be of type `string`", 'win')));
+        rejects.push(( localize(3539, "property `{0}` can be omitted or must be of type `string`", 'win')));
         return false;
     }
     return true;
@@ -86,33 +84,33 @@ const keybindingType = {
     default: { command: '', key: '' },
     properties: {
         command: {
-            description: ( localize(3504, 'Identifier of the command to run when keybinding is triggered.')),
+            description: ( localize(3540, 'Identifier of the command to run when keybinding is triggered.')),
             type: 'string'
         },
         args: {
-            description: ( localize(3505, "Arguments to pass to the command to execute."))
+            description: ( localize(3541, "Arguments to pass to the command to execute."))
         },
         key: {
             description: ( localize(
-                3506,
+                3542,
                 'Key or key sequence (separate keys with plus-sign and sequences with space, e.g. Ctrl+O and Ctrl+L L for a chord).'
             )),
             type: 'string'
         },
         mac: {
-            description: ( localize(3507, 'Mac specific key or key sequence.')),
+            description: ( localize(3543, 'Mac specific key or key sequence.')),
             type: 'string'
         },
         linux: {
-            description: ( localize(3508, 'Linux specific key or key sequence.')),
+            description: ( localize(3544, 'Linux specific key or key sequence.')),
             type: 'string'
         },
         win: {
-            description: ( localize(3509, 'Windows specific key or key sequence.')),
+            description: ( localize(3545, 'Windows specific key or key sequence.')),
             type: 'string'
         },
         when: {
-            description: ( localize(3510, 'Condition when the key is active.')),
+            description: ( localize(3546, 'Condition when the key is active.')),
             type: 'string'
         },
     }
@@ -121,7 +119,7 @@ const keybindingsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'keybindings',
     deps: [commandsExtensionPoint],
     jsonSchema: {
-        description: ( localize(3511, "Contributes keybindings.")),
+        description: ( localize(3547, "Contributes keybindings.")),
         oneOf: [
             keybindingType,
             {
@@ -132,33 +130,33 @@ const keybindingsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     }
 });
 const NUMPAD_PRINTABLE_SCANCODES = [
-    ScanCode.NumpadDivide,
-    ScanCode.NumpadMultiply,
-    ScanCode.NumpadSubtract,
-    ScanCode.NumpadAdd,
-    ScanCode.Numpad1,
-    ScanCode.Numpad2,
-    ScanCode.Numpad3,
-    ScanCode.Numpad4,
-    ScanCode.Numpad5,
-    ScanCode.Numpad6,
-    ScanCode.Numpad7,
-    ScanCode.Numpad8,
-    ScanCode.Numpad9,
-    ScanCode.Numpad0,
-    ScanCode.NumpadDecimal
+    90 ,
+    91 ,
+    92 ,
+    93 ,
+    95 ,
+    96 ,
+    97 ,
+    98 ,
+    99 ,
+    100 ,
+    101 ,
+    102 ,
+    103 ,
+    104 ,
+    105
 ];
 const otherMacNumpadMapping = ( (new Map()));
-otherMacNumpadMapping.set(ScanCode.Numpad1, KeyCode.Digit1);
-otherMacNumpadMapping.set(ScanCode.Numpad2, KeyCode.Digit2);
-otherMacNumpadMapping.set(ScanCode.Numpad3, KeyCode.Digit3);
-otherMacNumpadMapping.set(ScanCode.Numpad4, KeyCode.Digit4);
-otherMacNumpadMapping.set(ScanCode.Numpad5, KeyCode.Digit5);
-otherMacNumpadMapping.set(ScanCode.Numpad6, KeyCode.Digit6);
-otherMacNumpadMapping.set(ScanCode.Numpad7, KeyCode.Digit7);
-otherMacNumpadMapping.set(ScanCode.Numpad8, KeyCode.Digit8);
-otherMacNumpadMapping.set(ScanCode.Numpad9, KeyCode.Digit9);
-otherMacNumpadMapping.set(ScanCode.Numpad0, KeyCode.Digit0);
+otherMacNumpadMapping.set(95 , 22 );
+otherMacNumpadMapping.set(96 , 23 );
+otherMacNumpadMapping.set(97 , 24 );
+otherMacNumpadMapping.set(98 , 25 );
+otherMacNumpadMapping.set(99 , 26 );
+otherMacNumpadMapping.set(100 , 27 );
+otherMacNumpadMapping.set(101 , 28 );
+otherMacNumpadMapping.set(102 , 29 );
+otherMacNumpadMapping.set(103 , 30 );
+otherMacNumpadMapping.set(104 , 21 );
 let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchKeybindingService extends AbstractKeybindingService {
     constructor(contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService) {
         super(contextKeyService, commandService, telemetryService, notificationService, logService);
@@ -201,7 +199,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
                 return;
             }
             const keyboard = navigator.keyboard;
-            if (BrowserFeatures.keyboard === KeyboardSupport.None) {
+            if (BrowserFeatures.keyboard === 2 ) {
                 return;
             }
             if (isFullscreen(mainWindow)) {
@@ -430,43 +428,43 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         return result;
     }
     _assertBrowserConflicts(keybinding) {
-        if (BrowserFeatures.keyboard === KeyboardSupport.Always) {
+        if (BrowserFeatures.keyboard === 0 ) {
             return false;
         }
-        if (BrowserFeatures.keyboard === KeyboardSupport.FullScreen && isFullscreen(mainWindow)) {
+        if (BrowserFeatures.keyboard === 1  && isFullscreen(mainWindow)) {
             return false;
         }
         for (const chord of keybinding.chords) {
             if (!chord.metaKey && !chord.altKey && !chord.ctrlKey && !chord.shiftKey) {
                 continue;
             }
-            const modifiersMask = KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift;
+            const modifiersMask = 2048  | 512  | 1024 ;
             let partModifiersMask = 0;
             if (chord.metaKey) {
-                partModifiersMask |= KeyMod.CtrlCmd;
+                partModifiersMask |= 2048 ;
             }
             if (chord.shiftKey) {
-                partModifiersMask |= KeyMod.Shift;
+                partModifiersMask |= 1024 ;
             }
             if (chord.altKey) {
-                partModifiersMask |= KeyMod.Alt;
+                partModifiersMask |= 512 ;
             }
-            if (chord.ctrlKey && OS === OperatingSystem.Macintosh) {
-                partModifiersMask |= KeyMod.WinCtrl;
+            if (chord.ctrlKey && OS === 2 ) {
+                partModifiersMask |= 256 ;
             }
-            if ((partModifiersMask & modifiersMask) === (KeyMod.CtrlCmd | KeyMod.Alt)) {
-                if (chord instanceof ScanCodeChord && (chord.scanCode === ScanCode.ArrowLeft || chord.scanCode === ScanCode.ArrowRight)) {
+            if ((partModifiersMask & modifiersMask) === ((2048  | 512) )) {
+                if (chord instanceof ScanCodeChord && ((chord.scanCode === 86  || chord.scanCode === 85) )) {
                     return true;
                 }
-                if (chord instanceof KeyCodeChord && (chord.keyCode === KeyCode.LeftArrow || chord.keyCode === KeyCode.RightArrow)) {
+                if (chord instanceof KeyCodeChord && ((chord.keyCode === 15  || chord.keyCode === 17) )) {
                     return true;
                 }
             }
-            if ((partModifiersMask & modifiersMask) === KeyMod.CtrlCmd) {
-                if (chord instanceof ScanCodeChord && (chord.scanCode >= ScanCode.Digit1 && chord.scanCode <= ScanCode.Digit0)) {
+            if ((partModifiersMask & modifiersMask) === 2048 ) {
+                if (chord instanceof ScanCodeChord && ((chord.scanCode >= 36  && chord.scanCode <= 45) )) {
                     return true;
                 }
-                if (chord instanceof KeyCodeChord && (chord.keyCode >= KeyCode.Digit0 && chord.keyCode <= KeyCode.Digit9)) {
+                if (chord instanceof KeyCodeChord && ((chord.keyCode >= 21  && chord.keyCode <= 30) )) {
                     return true;
                 }
             }
@@ -504,7 +502,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         }
         if (rejects.length > 0) {
             collector.error(( localize(
-                3512,
+                3548,
                 "Invalid `contributes.{0}`: {1}",
                 keybindingsExtPoint.name,
                 rejects.join('\n')
@@ -512,12 +510,12 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         }
     }
     static bindToCurrentPlatform(key, mac, linux, win) {
-        if (OS === OperatingSystem.Windows && win) {
+        if (OS === 1  && win) {
             if (win) {
                 return win;
             }
         }
-        else if (OS === OperatingSystem.Macintosh) {
+        else if (OS === 2 ) {
             if (mac) {
                 return mac;
             }
@@ -537,10 +535,10 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         }
         let weight;
         if (isBuiltin) {
-            weight = KeybindingWeight.BuiltinExtension + idx;
+            weight = 300  + idx;
         }
         else {
-            weight = KeybindingWeight.ExternalExtension + idx;
+            weight = 400  + idx;
         }
         const commandAction = MenuRegistry.getCommand(command);
         const precondition = commandAction && commandAction.precondition;
@@ -594,7 +592,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
     static _getAllCommandsAsComment(boundCommands) {
         const unboundCommands = getAllUnboundCommands(boundCommands);
         const pretty = unboundCommands.sort().join('\n// - ');
-        return '// ' + ( localize(3513, "Here are other available commands: ")) + '\n// - ' + pretty;
+        return '// ' + ( localize(3549, "Here are other available commands: ")) + '\n// - ' + pretty;
     }
     mightProducePrintableCharacter(event) {
         if (event.ctrlKey || event.metaKey || event.altKey) {
@@ -664,7 +662,7 @@ class UserKeybindings extends Disposable {
             this.reloadConfigurationScheduler.schedule();
         }));
         this._register(this.fileService.onDidRunOperation((e) => {
-            if (e.operation === FileOperation.WRITE && ( (e.resource.toString())) === ( (this.userDataProfileService.currentProfile.keybindingsResource.toString()))) {
+            if (e.operation === 4  && ( (e.resource.toString())) === ( (this.userDataProfileService.currentProfile.keybindingsResource.toString()))) {
                 logService.debug('Keybindings file written');
                 this.reloadConfigurationScheduler.schedule();
             }
@@ -719,7 +717,7 @@ class KeybindingsJsonSchema {
         this.schema = {
             id: KeybindingsJsonSchema.schemaId,
             type: 'array',
-            title: ( localize(3514, "Keybindings configuration")),
+            title: ( localize(3550, "Keybindings configuration")),
             allowTrailingCommas: true,
             allowComments: true,
             definitions: {
@@ -743,7 +741,7 @@ class KeybindingsJsonSchema {
                     'type': 'string',
                     'enum': this.commandsEnum,
                     'enumDescriptions': this.commandsEnumDescriptions,
-                    'description': ( localize(3515, "Name of the command to execute")),
+                    'description': ( localize(3551, "Name of the command to execute")),
                 },
                 'commandType': {
                     'anyOf': [
@@ -754,7 +752,7 @@ class KeybindingsJsonSchema {
                             'type': 'string',
                             'enum': this.removalCommandsEnum,
                             'enumDescriptions': this.commandsEnumDescriptions,
-                            'description': ( localize(3516, "Name of the command to remove keyboard shortcut for")),
+                            'description': ( localize(3552, "Name of the command to remove keyboard shortcut for")),
                         },
                         {
                             'type': 'string'
@@ -772,7 +770,7 @@ class KeybindingsJsonSchema {
                 'properties': {
                     'key': {
                         'type': 'string',
-                        'description': ( localize(3517, "Key or key sequence (separated by space)")),
+                        'description': ( localize(3553, "Key or key sequence (separated by space)")),
                     },
                     'command': {
                         'anyOf': [
@@ -785,7 +783,7 @@ class KeybindingsJsonSchema {
                                         'type': 'array'
                                     },
                                     'errorMessage': ( localize(
-                                        3518,
+                                        3554,
                                         "Incorrect type. Expected \"{0}\". The field 'command' does not support running multiple commands. Use command 'runCommands' to pass it multiple commands to run.",
                                         'string'
                                     ))
@@ -801,10 +799,10 @@ class KeybindingsJsonSchema {
                     },
                     'when': {
                         'type': 'string',
-                        'description': ( localize(3519, "Condition when the key is active."))
+                        'description': ( localize(3555, "Condition when the key is active."))
                     },
                     'args': {
-                        'description': ( localize(3520, "Arguments to pass to the command to execute."))
+                        'description': ( localize(3556, "Arguments to pass to the command to execute."))
                     }
                 },
                 '$ref': '#/definitions/commandsSchemas'

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

@@ -3,10 +3,9 @@ import { localize } from 'vscode/vscode/vs/nls';
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { KeymapInfo } from '../common/keymapInfo.js';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
-import { readKeyboardConfig, DispatchConfig } from '../../../../platform/keyboardLayout/common/keyboardConfig.js';
+import { readKeyboardConfig } from '../../../../platform/keyboardLayout/common/keyboardConfig.js';
 import { CachedKeyboardMapper } from '../../../../platform/keyboardLayout/common/keyboardMapper.js';
-import { OS, OperatingSystem, isWindows, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
+import { OS, isWindows, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { WindowsKeyboardMapper } from '../common/windowsKeyboardMapper.js';
 import { FallbackKeyboardMapper } from 'vscode/vscode/vs/workbench/services/keybinding/common/fallbackKeyboardMapper';
 import { MacLinuxKeyboardMapper } from '../common/macLinuxKeyboardMapper.js';
@@ -206,7 +205,7 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
     }
     getKeyboardMapper() {
         const config = readKeyboardConfig(this._configurationService);
-        if (config.dispatch === DispatchConfig.KeyCode || !this._initialized || !this._activeKeymapInfo) {
+        if (config.dispatch === 1  || !this._initialized || !this._activeKeymapInfo) {
             return (
                  (new FallbackKeyboardMapper(config.mapAltGrToCtrlAlt, OS))
             );
@@ -242,7 +241,7 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
     static _createKeyboardMapper(keymapInfo, mapAltGrToCtrlAlt) {
         const rawMapping = keymapInfo.mapping;
         const isUSStandard = !!keymapInfo.layout.isUSStandard;
-        if (OS === OperatingSystem.Windows) {
+        if (OS === 1 ) {
             return (
                  (new WindowsKeyboardMapper(isUSStandard, rawMapping, mapAltGrToCtrlAlt))
             );
@@ -492,12 +491,12 @@ const keyboardConfiguration = {
     'id': 'keyboard',
     'order': 15,
     'type': 'object',
-    'title': ( localize(3521, "Keyboard")),
+    'title': ( localize(3557, "Keyboard")),
     'properties': {
         'keyboard.layout': {
             'type': 'string',
             'default': 'autodetect',
-            'description': ( localize(3522, "Control the keyboard layout used in web."))
+            'description': ( localize(3558, "Control the keyboard layout used in web."))
         }
     }
 };