@codingame/monaco-vscode-keybindings-service-override 11.1.2 → 12.0.1

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

@@ -1,19 +1,20 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { localize } 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';
 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 'vscode/vscode/vs/base/common/keybindingParser';
+import { KeybindingParser } from '@codingame/monaco-vscode-2a22c7b4-b906-5914-8cd1-3ed912fb738f-common/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 +22,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';
@@ -39,42 +42,46 @@ import { commandsExtensionPoint } from '../../actions/common/menusExtensionPoint
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
 import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
-import { getAllUnboundCommands } from 'vscode/vscode/vs/workbench/services/keybinding/browser/unboundCommands';
+import { getAllUnboundCommands } from '@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common/vscode/vs/workbench/services/keybinding/browser/unboundCommands';
 import { OutputBuilder, KeybindingIO } from '../common/keybindingIO.js';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 
 var WorkbenchKeybindingService_1;
 function isValidContributedKeyBinding(keyBinding, rejects) {
     if (!keyBinding) {
-        rejects.push(( localize(3536, "expected non-empty value.")));
+        rejects.push(( localize(11589, "expected non-empty value.")));
         return false;
     }
     if (typeof keyBinding.command !== 'string') {
         rejects.push(( localize(
-            3537,
+            11590,
             "property `{0}` is mandatory and must be of type `string`",
             'command'
         )));
         return false;
     }
     if (keyBinding.key && typeof keyBinding.key !== 'string') {
-        rejects.push(( localize(3538, "property `{0}` can be omitted or must be of type `string`", 'key')));
+        rejects.push(( localize(11591, "property `{0}` can be omitted or must be of type `string`", 'key')));
         return false;
     }
     if (keyBinding.when && typeof keyBinding.when !== 'string') {
-        rejects.push(( localize(3538, "property `{0}` can be omitted or must be of type `string`", 'when')));
+        rejects.push(( localize(11591, "property `{0}` can be omitted or must be of type `string`", 'when')));
         return false;
     }
     if (keyBinding.mac && typeof keyBinding.mac !== 'string') {
-        rejects.push(( localize(3538, "property `{0}` can be omitted or must be of type `string`", 'mac')));
+        rejects.push(( localize(11591, "property `{0}` can be omitted or must be of type `string`", 'mac')));
         return false;
     }
     if (keyBinding.linux && typeof keyBinding.linux !== 'string') {
-        rejects.push(( localize(3538, "property `{0}` can be omitted or must be of type `string`", 'linux')));
+        rejects.push(( localize(
+            11591,
+            "property `{0}` can be omitted or must be of type `string`",
+            'linux'
+        )));
         return false;
     }
     if (keyBinding.win && typeof keyBinding.win !== 'string') {
-        rejects.push(( localize(3538, "property `{0}` can be omitted or must be of type `string`", 'win')));
+        rejects.push(( localize(11591, "property `{0}` can be omitted or must be of type `string`", 'win')));
         return false;
     }
     return true;
@@ -84,33 +91,33 @@ const keybindingType = {
     default: { command: '', key: '' },
     properties: {
         command: {
-            description: ( localize(3539, 'Identifier of the command to run when keybinding is triggered.')),
+            description: ( localize(11592, 'Identifier of the command to run when keybinding is triggered.')),
             type: 'string'
         },
         args: {
-            description: ( localize(3540, "Arguments to pass to the command to execute."))
+            description: ( localize(11593, "Arguments to pass to the command to execute."))
         },
         key: {
             description: ( localize(
-                3541,
+                11594,
                 '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(3542, 'Mac specific key or key sequence.')),
+            description: ( localize(11595, 'Mac specific key or key sequence.')),
             type: 'string'
         },
         linux: {
-            description: ( localize(3543, 'Linux specific key or key sequence.')),
+            description: ( localize(11596, 'Linux specific key or key sequence.')),
             type: 'string'
         },
         win: {
-            description: ( localize(3544, 'Windows specific key or key sequence.')),
+            description: ( localize(11597, 'Windows specific key or key sequence.')),
             type: 'string'
         },
         when: {
-            description: ( localize(3545, 'Condition when the key is active.')),
+            description: ( localize(11598, 'Condition when the key is active.')),
             type: 'string'
         },
     }
@@ -119,7 +126,7 @@ const keybindingsExtPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'keybindings',
     deps: [commandsExtensionPoint],
     jsonSchema: {
-        description: ( localize(3546, "Contributes keybindings.")),
+        description: ( localize(11599, "Contributes keybindings.")),
         oneOf: [
             keybindingType,
             {
@@ -130,33 +137,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 );
+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);
 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);
@@ -164,7 +171,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         this.keyboardLayoutService = keyboardLayoutService;
         this._contributions = [];
         this.isComposingGlobalContextKey = contextKeyService.createKey('isComposing', false);
-        this.kbsJsonSchema = ( (new KeybindingsJsonSchema()));
+        this.kbsJsonSchema = ( new KeybindingsJsonSchema());
         this.updateKeybindingsJsonSchema();
         this._keyboardMapper = this.keyboardLayoutService.getKeyboardMapper();
         this._register(this.keyboardLayoutService.onDidChangeKeyboardLayout(() => {
@@ -173,7 +180,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         }));
         this._keybindingHoldMode = null;
         this._cachedResolver = null;
-        this.userKeybindings = this._register(( (new UserKeybindings(userDataProfileService, uriIdentityService, fileService, logService))));
+        this.userKeybindings = this._register(( new UserKeybindings(userDataProfileService, uriIdentityService, fileService, logService)));
         this.userKeybindings.initialize().then(() => {
             if (this.userKeybindings.keybindings.length) {
                 this.updateResolver();
@@ -199,7 +206,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)) {
@@ -213,13 +220,13 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         }));
     }
     _registerKeyListeners(window) {
-        const disposables = ( (new DisposableStore()));
+        const disposables = ( new DisposableStore());
         disposables.add(addDisposableListener(window, EventType.KEY_DOWN, (e) => {
             if (this._keybindingHoldMode) {
                 return;
             }
             this.isComposingGlobalContextKey.set(e.isComposing);
-            const keyEvent = ( (new StandardKeyboardEvent(e)));
+            const keyEvent = ( new StandardKeyboardEvent(e));
             this._log(`/ Received  keydown event - ${printKeyboardEvent(e)}`);
             this._log(`| Converted keydown event - ${printStandardKeyboardEvent(keyEvent)}`);
             const shouldPreventDefault = this._dispatch(keyEvent, keyEvent.target);
@@ -231,7 +238,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         disposables.add(addDisposableListener(window, EventType.KEY_UP, (e) => {
             this._resetKeybindingHoldMode();
             this.isComposingGlobalContextKey.set(e.isComposing);
-            const keyEvent = ( (new StandardKeyboardEvent(e)));
+            const keyEvent = ( new StandardKeyboardEvent(e));
             const shouldPreventDefault = this._singleModifierDispatch(keyEvent, keyEvent.target);
             if (shouldPreventDefault) {
                 keyEvent.preventDefault();
@@ -253,17 +260,13 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
     _printKeybinding(keybinding) {
         return UserSettingsLabelProvider.toLabel(OS, keybinding.chords, (chord) => {
             if (chord instanceof KeyCodeChord) {
-                return (
-                     (KeyCodeUtils.toString(chord.keyCode))
-                );
+                return ( KeyCodeUtils.toString(chord.keyCode));
             }
-            return (
-                 (ScanCodeUtils.toString(chord.scanCode))
-            );
+            return ( ScanCodeUtils.toString(chord.scanCode));
         }) || '[null]';
     }
     _printResolvedKeybinding(resolvedKeybinding) {
-        return ( (resolvedKeybinding.getDispatchChords().map(x => x || '[null]'))).join(' ');
+        return ( resolvedKeybinding.getDispatchChords().map(x => x || '[null]')).join(' ');
     }
     _printResolvedKeybindings(output, input, resolvedKeybindings) {
         const padLength = 35;
@@ -279,7 +282,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         }
     }
     _dumpResolveKeybindingDebugInfo() {
-        const seenBindings = ( (new Set()));
+        const seenBindings = ( new Set());
         const result = [];
         result.push(`Default Resolved Keybindings (unique only):`);
         for (const item of KeybindingsRegistry.getDefaultKeybindings()) {
@@ -287,7 +290,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
                 continue;
             }
             const input = this._printKeybinding(item.keybinding);
-            if (( (seenBindings.has(input)))) {
+            if (( seenBindings.has(input))) {
                 continue;
             }
             seenBindings.add(input);
@@ -300,7 +303,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
                 continue;
             }
             const input = item._sourceKey ?? 'Impossible: missing source key, but has keybinding';
-            if (( (seenBindings.has(input)))) {
+            if (( seenBindings.has(input))) {
                 continue;
             }
             seenBindings.add(input);
@@ -327,7 +330,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         if (this._currentlyDispatchingCommandId !== commandId) {
             return undefined;
         }
-        this._keybindingHoldMode = ( (new DeferredPromise()));
+        this._keybindingHoldMode = ( new DeferredPromise());
         const focusTracker = trackFocus(getWindow(undefined));
         const listener = focusTracker.onDidBlur(() => this._resetKeybindingHoldMode());
         this._keybindingHoldMode.p.finally(() => {
@@ -357,7 +360,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         if (!this._cachedResolver) {
             const defaults = this._resolveKeybindingItems(KeybindingsRegistry.getDefaultKeybindings(), true);
             const overrides = this.getUserKeybindingItems();
-            this._cachedResolver = ( (new KeybindingResolver(defaults, overrides, (str) => this._log(str))));
+            this._cachedResolver = ( new KeybindingResolver(defaults, overrides, (str) => this._log(str)));
         }
         return this._cachedResolver;
     }
@@ -371,7 +374,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
             const when = item.when || undefined;
             const keybinding = item.keybinding;
             if (!keybinding) {
-                result[resultLen++] = ( (new ResolvedKeybindingItem(
+                result[resultLen++] = ( new ResolvedKeybindingItem(
                     undefined,
                     item.command,
                     item.commandArgs,
@@ -379,7 +382,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
                     isDefault,
                     item.extensionId,
                     item.isBuiltinExtension
-                )));
+                ));
             }
             else {
                 if (this._assertBrowserConflicts(keybinding)) {
@@ -388,7 +391,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
                 const resolvedKeybindings = this._keyboardMapper.resolveKeybinding(keybinding);
                 for (let i = resolvedKeybindings.length - 1; i >= 0; i--) {
                     const resolvedKeybinding = resolvedKeybindings[i];
-                    result[resultLen++] = ( (new ResolvedKeybindingItem(
+                    result[resultLen++] = ( new ResolvedKeybindingItem(
                         resolvedKeybinding,
                         item.command,
                         item.commandArgs,
@@ -396,7 +399,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
                         isDefault,
                         item.extensionId,
                         item.isBuiltinExtension
-                    )));
+                    ));
                 }
             }
         }
@@ -408,12 +411,12 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         for (const item of items) {
             const when = item.when || undefined;
             if (!item.keybinding) {
-                result[resultLen++] = ( (new ResolvedKeybindingItem(undefined, item.command, item.commandArgs, when, isDefault, null, false)));
+                result[resultLen++] = ( new ResolvedKeybindingItem(undefined, item.command, item.commandArgs, when, isDefault, null, false));
             }
             else {
                 const resolvedKeybindings = this._keyboardMapper.resolveKeybinding(item.keybinding);
                 for (const resolvedKeybinding of resolvedKeybindings) {
-                    result[resultLen++] = ( (new ResolvedKeybindingItem(
+                    result[resultLen++] = ( new ResolvedKeybindingItem(
                         resolvedKeybinding,
                         item.command,
                         item.commandArgs,
@@ -421,50 +424,50 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
                         isDefault,
                         null,
                         false
-                    )));
+                    ));
                 }
             }
         }
         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;
                 }
             }
@@ -502,7 +505,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         }
         if (rejects.length > 0) {
             collector.error(( localize(
-                3547,
+                11600,
                 "Invalid `contributes.{0}`: {1}",
                 keybindingsExtPoint.name,
                 rejects.join('\n')
@@ -510,12 +513,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;
             }
@@ -535,16 +538,16 @@ 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;
         let fullWhen;
         if (when && precondition) {
-            fullWhen = ( (ContextKeyExpr.and(precondition, ContextKeyExpr.deserialize(when))));
+            fullWhen = ( ContextKeyExpr.and(precondition, ContextKeyExpr.deserialize(when)));
         }
         else if (when) {
             fullWhen = ContextKeyExpr.deserialize(when);
@@ -572,7 +575,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
             + WorkbenchKeybindingService_1._getAllCommandsAsComment(boundCommands));
     }
     static _getDefaultKeybindings(defaultKeybindings) {
-        const out = ( (new OutputBuilder()));
+        const out = ( new OutputBuilder());
         out.writeLine('[');
         const lastIndex = defaultKeybindings.length - 1;
         defaultKeybindings.forEach((k, index) => {
@@ -585,14 +588,12 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
             }
         });
         out.writeLine(']');
-        return (
-             (out.toString())
-        );
+        return ( out.toString());
     }
     static _getAllCommandsAsComment(boundCommands) {
         const unboundCommands = getAllUnboundCommands(boundCommands);
         const pretty = unboundCommands.sort().join('\n// - ');
-        return '// ' + ( localize(3548, "Here are other available commands: ")) + '\n// - ' + pretty;
+        return '// ' + ( localize(11601, "Here are other available commands: ")) + '\n// - ' + pretty;
     }
     mightProducePrintableCharacter(event) {
         if (event.ctrlKey || event.metaKey || event.altKey) {
@@ -626,19 +627,19 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         return true;
     }
 };
-WorkbenchKeybindingService = WorkbenchKeybindingService_1 = ( (__decorate([
-    ( (__param(0, IContextKeyService))),
-    ( (__param(1, ICommandService))),
-    ( (__param(2, ITelemetryService))),
-    ( (__param(3, INotificationService))),
-    ( (__param(4, IUserDataProfileService))),
-    ( (__param(5, IHostService))),
-    ( (__param(6, IExtensionService))),
-    ( (__param(7, IFileService))),
-    ( (__param(8, IUriIdentityService))),
-    ( (__param(9, ILogService))),
-    ( (__param(10, IKeyboardLayoutService)))
-], WorkbenchKeybindingService)));
+WorkbenchKeybindingService = WorkbenchKeybindingService_1 = ( __decorate([
+    ( __param(0, IContextKeyService)),
+    ( __param(1, ICommandService)),
+    ( __param(2, ITelemetryService)),
+    ( __param(3, INotificationService)),
+    ( __param(4, IUserDataProfileService)),
+    ( __param(5, IHostService)),
+    ( __param(6, IExtensionService)),
+    ( __param(7, IFileService)),
+    ( __param(8, IUriIdentityService)),
+    ( __param(9, ILogService)),
+    ( __param(10, IKeyboardLayoutService))
+], WorkbenchKeybindingService));
 class UserKeybindings extends Disposable {
     get keybindings() { return this._keybindings; }
     constructor(userDataProfileService, uriIdentityService, fileService, logService) {
@@ -648,21 +649,21 @@ class UserKeybindings extends Disposable {
         this.fileService = fileService;
         this._rawKeybindings = [];
         this._keybindings = [];
-        this.watchDisposables = this._register(( (new DisposableStore())));
-        this._onDidChange = this._register(( (new Emitter())));
+        this.watchDisposables = this._register(( new DisposableStore()));
+        this._onDidChange = this._register(( new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this.watch();
-        this.reloadConfigurationScheduler = this._register(( (new RunOnceScheduler(() => this.reload().then(changed => {
+        this.reloadConfigurationScheduler = this._register(( new RunOnceScheduler(() => this.reload().then(changed => {
             if (changed) {
                 this._onDidChange.fire();
             }
-        }), 50))));
+        }), 50)));
         this._register(Event.filter(this.fileService.onDidFilesChange, e => e.contains(this.userDataProfileService.currentProfile.keybindingsResource))(() => {
             logService.debug('Keybindings file changed');
             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();
             }
@@ -691,13 +692,13 @@ class UserKeybindings extends Disposable {
             return false;
         }
         this._rawKeybindings = newKeybindings;
-        this._keybindings = ( (this._rawKeybindings.map((k) => KeybindingIO.readUserKeybindingItem(k))));
+        this._keybindings = ( this._rawKeybindings.map((k) => KeybindingIO.readUserKeybindingItem(k)));
         return true;
     }
     async readUserKeybindings() {
         try {
             const content = await this.fileService.readFile(this.userDataProfileService.currentProfile.keybindingsResource);
-            const value = parse(( (content.value.toString())));
+            const value = parse(( content.value.toString()));
             return Array.isArray(value)
                 ? value.filter(v => v && typeof v === 'object' )
                 : [];
@@ -717,7 +718,7 @@ class KeybindingsJsonSchema {
         this.schema = {
             id: KeybindingsJsonSchema.schemaId,
             type: 'array',
-            title: ( localize(3549, "Keybindings configuration")),
+            title: ( localize(11602, "Keybindings configuration")),
             allowTrailingCommas: true,
             allowComments: true,
             definitions: {
@@ -741,7 +742,7 @@ class KeybindingsJsonSchema {
                     'type': 'string',
                     'enum': this.commandsEnum,
                     'enumDescriptions': this.commandsEnumDescriptions,
-                    'description': ( localize(3550, "Name of the command to execute")),
+                    'description': ( localize(11603, "Name of the command to execute")),
                 },
                 'commandType': {
                     'anyOf': [
@@ -752,7 +753,7 @@ class KeybindingsJsonSchema {
                             'type': 'string',
                             'enum': this.removalCommandsEnum,
                             'enumDescriptions': this.commandsEnumDescriptions,
-                            'description': ( localize(3551, "Name of the command to remove keyboard shortcut for")),
+                            'description': ( localize(11604, "Name of the command to remove keyboard shortcut for")),
                         },
                         {
                             'type': 'string'
@@ -770,7 +771,7 @@ class KeybindingsJsonSchema {
                 'properties': {
                     'key': {
                         'type': 'string',
-                        'description': ( localize(3552, "Key or key sequence (separated by space)")),
+                        'description': ( localize(11605, "Key or key sequence (separated by space)")),
                     },
                     'command': {
                         'anyOf': [
@@ -783,7 +784,7 @@ class KeybindingsJsonSchema {
                                         'type': 'array'
                                     },
                                     'errorMessage': ( localize(
-                                        3553,
+                                        11606,
                                         "Incorrect type. Expected \"{0}\". The field 'command' does not support running multiple commands. Use command 'runCommands' to pass it multiple commands to run.",
                                         'string'
                                     ))
@@ -799,16 +800,16 @@ class KeybindingsJsonSchema {
                     },
                     'when': {
                         'type': 'string',
-                        'description': ( localize(3554, "Condition when the key is active."))
+                        'description': ( localize(11607, "Condition when the key is active."))
                     },
                     'args': {
-                        'description': ( localize(3555, "Arguments to pass to the command to execute."))
+                        'description': ( localize(11608, "Arguments to pass to the command to execute."))
                     }
                 },
                 '$ref': '#/definitions/commandsSchemas'
             }
         };
-        this.schemaRegistry = ( (Registry.as(Extensions.JSONContribution)));
+        this.schemaRegistry = ( Registry.as(Extensions.JSONContribution));
         this.schemaRegistry.registerSchema(KeybindingsJsonSchema.schemaId, this.schema);
     }
     updateSchema(additionalContributions) {
@@ -816,10 +817,10 @@ class KeybindingsJsonSchema {
         this.commandsEnum.length = 0;
         this.removalCommandsEnum.length = 0;
         this.commandsEnumDescriptions.length = 0;
-        const knownCommands = ( (new Set()));
+        const knownCommands = ( new Set());
         const addKnownCommand = (commandId, description) => {
             if (!/^_/.test(commandId)) {
-                if (!( (knownCommands.has(commandId)))) {
+                if (!( knownCommands.has(commandId))) {
                     knownCommands.add(commandId);
                     this.commandsEnum.push(commandId);
                     this.commandsEnumDescriptions.push(isLocalizedString(description) ? description.value : description);
@@ -855,7 +856,7 @@ class KeybindingsJsonSchema {
             this.commandsSchemas.push(addition);
         }
         const menuCommands = MenuRegistry.getCommands();
-        for (const commandId of ( (menuCommands.keys()))) {
+        for (const commandId of ( menuCommands.keys())) {
             addKnownCommand(commandId);
         }
         this.commandsSchemas.push(...additionalContributions);