@codingame/monaco-vscode-keybindings-service-override 5.2.0 → 6.0.0

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 { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { onDidChangeFullscreen, isFullscreen } from 'vscode/vscode/vs/base/browser/browser';
-import { BrowserFeatures } from 'vscode/vscode/vs/base/browser/canIUse';
+import { BrowserFeatures, KeyboardSupport } 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 { KeyCodeUtils, ScanCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE } from 'vscode/vscode/vs/base/common/keyCodes';
+import { ScanCode, KeyCode, KeyCodeUtils, ScanCodeUtils, KeyMod, 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, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
+import { OS, OperatingSystem, 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,12 +21,14 @@ 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 } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingsRegistry, KeybindingWeight } 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';
@@ -162,33 +164,33 @@ const keybindingsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     }
 });
 const NUMPAD_PRINTABLE_SCANCODES = [
-    90 ,
-    91 ,
-    92 ,
-    93 ,
-    95 ,
-    96 ,
-    97 ,
-    98 ,
-    99 ,
-    100 ,
-    101 ,
-    102 ,
-    103 ,
-    104 ,
-    105
+    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
 ];
 const otherMacNumpadMapping = ( (new Map()));
-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 );
+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);
 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);
@@ -231,7 +233,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
                 return;
             }
             const keyboard = navigator.keyboard;
-            if (BrowserFeatures.keyboard === 2 ) {
+            if (BrowserFeatures.keyboard === KeyboardSupport.None) {
                 return;
             }
             if (isFullscreen(mainWindow)) {
@@ -460,43 +462,43 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         return result;
     }
     _assertBrowserConflicts(keybinding) {
-        if (BrowserFeatures.keyboard === 0 ) {
+        if (BrowserFeatures.keyboard === KeyboardSupport.Always) {
             return false;
         }
-        if (BrowserFeatures.keyboard === 1  && isFullscreen(mainWindow)) {
+        if (BrowserFeatures.keyboard === KeyboardSupport.FullScreen && isFullscreen(mainWindow)) {
             return false;
         }
         for (const chord of keybinding.chords) {
             if (!chord.metaKey && !chord.altKey && !chord.ctrlKey && !chord.shiftKey) {
                 continue;
             }
-            const modifiersMask = 2048  | 512  | 1024 ;
+            const modifiersMask = KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift;
             let partModifiersMask = 0;
             if (chord.metaKey) {
-                partModifiersMask |= 2048 ;
+                partModifiersMask |= KeyMod.CtrlCmd;
             }
             if (chord.shiftKey) {
-                partModifiersMask |= 1024 ;
+                partModifiersMask |= KeyMod.Shift;
             }
             if (chord.altKey) {
-                partModifiersMask |= 512 ;
+                partModifiersMask |= KeyMod.Alt;
             }
-            if (chord.ctrlKey && OS === 2 ) {
-                partModifiersMask |= 256 ;
+            if (chord.ctrlKey && OS === OperatingSystem.Macintosh) {
+                partModifiersMask |= KeyMod.WinCtrl;
             }
-            if ((partModifiersMask & modifiersMask) === ((2048  | 512) )) {
-                if (chord instanceof ScanCodeChord && ((chord.scanCode === 86  || chord.scanCode === 85) )) {
+            if ((partModifiersMask & modifiersMask) === (KeyMod.CtrlCmd | KeyMod.Alt)) {
+                if (chord instanceof ScanCodeChord && (chord.scanCode === ScanCode.ArrowLeft || chord.scanCode === ScanCode.ArrowRight)) {
                     return true;
                 }
-                if (chord instanceof KeyCodeChord && ((chord.keyCode === 15  || chord.keyCode === 17) )) {
+                if (chord instanceof KeyCodeChord && (chord.keyCode === KeyCode.LeftArrow || chord.keyCode === KeyCode.RightArrow)) {
                     return true;
                 }
             }
-            if ((partModifiersMask & modifiersMask) === 2048 ) {
-                if (chord instanceof ScanCodeChord && ((chord.scanCode >= 36  && chord.scanCode <= 45) )) {
+            if ((partModifiersMask & modifiersMask) === KeyMod.CtrlCmd) {
+                if (chord instanceof ScanCodeChord && (chord.scanCode >= ScanCode.Digit1 && chord.scanCode <= ScanCode.Digit0)) {
                     return true;
                 }
-                if (chord instanceof KeyCodeChord && ((chord.keyCode >= 21  && chord.keyCode <= 30) )) {
+                if (chord instanceof KeyCodeChord && (chord.keyCode >= KeyCode.Digit0 && chord.keyCode <= KeyCode.Digit9)) {
                     return true;
                 }
             }
@@ -543,12 +545,12 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         }
     }
     static bindToCurrentPlatform(key, mac, linux, win) {
-        if (OS === 1  && win) {
+        if (OS === OperatingSystem.Windows && win) {
             if (win) {
                 return win;
             }
         }
-        else if (OS === 2 ) {
+        else if (OS === OperatingSystem.Macintosh) {
             if (mac) {
                 return mac;
             }
@@ -568,10 +570,10 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         }
         let weight;
         if (isBuiltin) {
-            weight = 300  + idx;
+            weight = KeybindingWeight.BuiltinExtension + idx;
         }
         else {
-            weight = 400  + idx;
+            weight = KeybindingWeight.ExternalExtension + idx;
         }
         const commandAction = MenuRegistry.getCommand(command);
         const precondition = commandAction && commandAction.precondition;
@@ -695,7 +697,7 @@ class UserKeybindings extends Disposable {
             this.reloadConfigurationScheduler.schedule();
         }));
         this._register(this.fileService.onDidRunOperation((e) => {
-            if (e.operation === 4  && ( (e.resource.toString())) === ( (this.userDataProfileService.currentProfile.keybindingsResource.toString()))) {
+            if (e.operation === FileOperation.WRITE && ( (e.resource.toString())) === ( (this.userDataProfileService.currentProfile.keybindingsResource.toString()))) {
                 logService.debug('Keybindings file written');
                 this.reloadConfigurationScheduler.schedule();
             }

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

@@ -3,9 +3,10 @@ import { localizeWithPath } 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 { readKeyboardConfig } from '../../../../platform/keyboardLayout/common/keyboardConfig.js';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
+import { readKeyboardConfig, DispatchConfig } from '../../../../platform/keyboardLayout/common/keyboardConfig.js';
 import { CachedKeyboardMapper } from '../../../../platform/keyboardLayout/common/keyboardMapper.js';
-import { OS, isWindows, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
+import { OS, OperatingSystem, 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 +207,7 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
     }
     getKeyboardMapper() {
         const config = readKeyboardConfig(this._configurationService);
-        if (config.dispatch === 1  || !this._initialized || !this._activeKeymapInfo) {
+        if (config.dispatch === DispatchConfig.KeyCode || !this._initialized || !this._activeKeymapInfo) {
             return (
                  (new FallbackKeyboardMapper(config.mapAltGrToCtrlAlt, OS))
             );
@@ -242,7 +243,7 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
     static _createKeyboardMapper(keymapInfo, mapAltGrToCtrlAlt) {
         const rawMapping = keymapInfo.mapping;
         const isUSStandard = !!keymapInfo.layout.isUSStandard;
-        if (OS === 1 ) {
+        if (OS === OperatingSystem.Windows) {
             return (
                  (new WindowsKeyboardMapper(isUSStandard, rawMapping, mapAltGrToCtrlAlt))
             );