@codingame/monaco-vscode-keybindings-service-override 4.5.0 → 4.5.2

package/index.d.ts

@@ -1,2 +1,2 @@
-export { default, defaultUserKeybindindsFile, initUserKeybindings, updateUserKeybindings } from './keybindings.js';
-export { IUserFriendlyKeybinding } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+export * from 'vscode/service-override/keybindings';
+export { default } from 'vscode/service-override/keybindings';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-keybindings-service-override",
-  "version": "4.5.0",
+  "version": "4.5.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.5.0",
-    "@codingame/monaco-vscode-files-service-override": "4.5.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.5.2",
+    "@codingame/monaco-vscode-files-service-override": "4.5.2"
   }
 }

package/vscode/src/vs/platform/keyboardLayout/common/keyboardConfig.js

@@ -3,22 +3,19 @@ import { OS } from 'vscode/vscode/vs/base/common/platform';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 
+const _moduleId = "vs/platform/keyboardLayout/common/keyboardConfig";
 function readKeyboardConfig(configurationService) {
     const keyboard = configurationService.getValue('keyboard');
     const dispatch = ((keyboard?.dispatch === 'keyCode' ? 1  : 0) );
     const mapAltGrToCtrlAlt = Boolean(keyboard?.mapAltGrToCtrlAlt);
     return { dispatch, mapAltGrToCtrlAlt };
 }
-const configurationRegistry = ( Registry.as(Extensions.Configuration));
+const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
 const keyboardConfiguration = {
     'id': 'keyboard',
     'order': 15,
     'type': 'object',
-    'title': ( localizeWithPath(
-        'vs/platform/keyboardLayout/common/keyboardConfig',
-        'keyboardConfigurationTitle',
-        "Keyboard"
-    )),
+    'title': ( localizeWithPath(_moduleId, 0, "Keyboard")),
     'properties': {
         'keyboard.dispatch': {
             scope: 1 ,
@@ -26,8 +23,8 @@ const keyboardConfiguration = {
             enum: ['code', 'keyCode'],
             default: 'code',
             markdownDescription: ( localizeWithPath(
-                'vs/platform/keyboardLayout/common/keyboardConfig',
-                'dispatch',
+                _moduleId,
+                1,
                 "Controls the dispatching logic for key presses to use either `code` (recommended) or `keyCode`."
             )),
             included: OS === 2  || OS === 3
@@ -37,8 +34,8 @@ const keyboardConfiguration = {
             type: 'boolean',
             default: false,
             markdownDescription: ( localizeWithPath(
-                'vs/platform/keyboardLayout/common/keyboardConfig',
-                'mapAltGrToCtrlAlt',
+                _moduleId,
+                2,
                 "Controls if the AltGraph+ modifier should be treated as Ctrl+Alt+."
             )),
             included: OS === 1

package/vscode/src/vs/workbench/contrib/commands/common/commands.contribution.js

@@ -4,22 +4,15 @@ import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/comma
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 
+const _moduleId = "vs/workbench/contrib/commands/common/commands.contribution";
 class RunCommands extends Action2 {
     constructor() {
         super({
             id: 'runCommands',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/commands/common/commands.contribution',
-                'runCommands',
-                "Run Commands"
-            )),
+            title: ( localize2WithPath(_moduleId, 0, "Run Commands")),
             f1: false,
             metadata: {
-                description: ( localizeWithPath(
-                    'vs/workbench/contrib/commands/common/commands.contribution',
-                    'runCommands.description',
-                    "Run several commands"
-                )),
+                description: ( localizeWithPath(_moduleId, 1, "Run several commands")),
                 args: [
                     {
                         name: 'args',
@@ -29,11 +22,7 @@ class RunCommands extends Action2 {
                             properties: {
                                 commands: {
                                     type: 'array',
-                                    description: ( localizeWithPath(
-                                        'vs/workbench/contrib/commands/common/commands.contribution',
-                                        'runCommands.commands',
-                                        "Commands to run"
-                                    )),
+                                    description: ( localizeWithPath(_moduleId, 2, "Commands to run")),
                                     items: {
                                         anyOf: [
                                             {
@@ -73,16 +62,16 @@ class RunCommands extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!this._isCommandArgs(args)) {
             notificationService.error(( localizeWithPath(
-                'vs/workbench/contrib/commands/common/commands.contribution',
-                'runCommands.invalidArgs',
+                _moduleId,
+                3,
                 "'runCommands' has received an argument with incorrect type. Please, review the argument passed to the command."
             )));
             return;
         }
         if (args.commands.length === 0) {
             notificationService.warn(( localizeWithPath(
-                'vs/workbench/contrib/commands/common/commands.contribution',
-                'runCommands.noCommandsToRun',
+                _moduleId,
+                4,
                 "'runCommands' has not received commands to run. Did you forget to pass commands in the 'runCommands' argument?"
             )));
             return;

package/vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js

@@ -5,15 +5,12 @@ import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommon
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 import { showWindowLogActionId } from 'vscode/vscode/vs/workbench/services/log/common/logConstants';
 
+const _moduleId = "vs/workbench/contrib/keybindings/browser/keybindings.contribution";
 class ToggleKeybindingsLogAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleKeybindingsLog',
-            title: ( localize2WithPath(
-                'vs/workbench/contrib/keybindings/browser/keybindings.contribution',
-                'toggleKeybindingsLog',
-                "Toggle Keyboard Shortcuts Troubleshooting"
-            )),
+            title: ( localize2WithPath(_moduleId, 0, "Toggle Keyboard Shortcuts Troubleshooting")),
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.js

@@ -22,9 +22,10 @@ import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/use
 import { DEFINE_KEYBINDING_EDITOR_CONTRIB_ID } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences';
 
 var KeybindingEditorDecorationsRenderer_1;
+const _moduleId = "vs/workbench/contrib/preferences/browser/keybindingsEditorContribution";
 const NLS_KB_LAYOUT_ERROR_MESSAGE = ( localizeWithPath(
-    'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution',
-    'defineKeybinding.kbLayoutErrorMessage',
+    _moduleId,
+    0,
     "You won't be able to produce this key combination under your current keyboard layout."
 ));
 let DefineKeybindingEditorContribution = class DefineKeybindingEditorContribution extends Disposable {
@@ -33,7 +34,7 @@ let DefineKeybindingEditorContribution = class DefineKeybindingEditorContributio
         this._editor = _editor;
         this._instantiationService = _instantiationService;
         this._userDataProfileService = _userDataProfileService;
-        this._keybindingDecorationRenderer = this._register(( new MutableDisposable()));
+        this._keybindingDecorationRenderer = this._register(( (new MutableDisposable())));
         this._defineWidget = this._register(this._instantiationService.createInstance(DefineKeybindingOverlayWidget, this._editor));
         this._register(this._editor.onDidChangeModel(e => this._update()));
         this._update();
@@ -51,7 +52,7 @@ let DefineKeybindingEditorContribution = class DefineKeybindingEditorContributio
     _onAccepted(keybinding) {
         this._editor.focus();
         if (keybinding && this._editor.hasModel()) {
-            const regexp = ( new RegExp(/\\/g));
+            const regexp = ( (new RegExp(/\\/g)));
             const backslash = regexp.test(keybinding);
             if (backslash) {
                 keybinding = keybinding.slice(0, -1) + '\\\\';
@@ -70,17 +71,17 @@ let DefineKeybindingEditorContribution = class DefineKeybindingEditorContributio
         }
     }
 };
-DefineKeybindingEditorContribution = ( __decorate([
-    ( __param(1, IInstantiationService)),
-    ( __param(2, IUserDataProfileService))
-], DefineKeybindingEditorContribution));
+DefineKeybindingEditorContribution = ( (__decorate([
+    ( (__param(1, IInstantiationService))),
+    ( (__param(2, IUserDataProfileService)))
+], DefineKeybindingEditorContribution)));
 let KeybindingEditorDecorationsRenderer = KeybindingEditorDecorationsRenderer_1 = class KeybindingEditorDecorationsRenderer extends Disposable {
     constructor(_editor, _keybindingService) {
         super();
         this._editor = _editor;
         this._keybindingService = _keybindingService;
         this._dec = this._editor.createDecorationsCollection();
-        this._updateDecorations = this._register(( new RunOnceScheduler(() => this._updateDecorationsNow(), 500)));
+        this._updateDecorations = this._register(( (new RunOnceScheduler(() => this._updateDecorationsNow(), 500))));
         const model = assertIsDefined(this._editor.getModel());
         this._register(model.onDidChangeContent(() => this._updateDecorations.schedule()));
         this._register(this._keybindingService.onDidUpdateKeybindings(() => this._updateDecorations.schedule()));
@@ -175,51 +176,34 @@ let KeybindingEditorDecorationsRenderer = KeybindingEditorDecorationsRenderer_1
         let className;
         let overviewRulerColor;
         if (isError) {
-            msg = ( new MarkdownString()).appendText(NLS_KB_LAYOUT_ERROR_MESSAGE);
+            msg = ( (new MarkdownString())).appendText(NLS_KB_LAYOUT_ERROR_MESSAGE);
             className = 'keybindingError';
             overviewRulerColor = themeColorFromId(overviewRulerError);
         }
         else {
             if (usLabel && uiLabel !== usLabel) {
-                msg = ( new MarkdownString(( localizeWithPath(
-                    'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution',
-                    {
-                        key: 'defineKeybinding.kbLayoutLocalAndUSMessage',
-                        comment: [
-                            'Please translate maintaining the stars (*) around the placeholders such that they will be rendered in bold.',
-                            'The placeholders will contain a keyboard combination e.g. Ctrl+Shift+/'
-                        ]
-                    },
+                msg = ( (new MarkdownString(( localizeWithPath(
+                    _moduleId,
+                    1,
                     "**{0}** for your current keyboard layout (**{1}** for US standard).",
                     uiLabel,
                     usLabel
-                ))));
+                )))));
             }
             else {
-                msg = ( new MarkdownString(( localizeWithPath(
-                    'vs/workbench/contrib/preferences/browser/keybindingsEditorContribution',
-                    {
-                        key: 'defineKeybinding.kbLayoutLocalMessage',
-                        comment: [
-                            'Please translate maintaining the stars (*) around the placeholder such that it will be rendered in bold.',
-                            'The placeholder will contain a keyboard combination e.g. Ctrl+Shift+/'
-                        ]
-                    },
-                    "**{0}** for your current keyboard layout.",
-                    uiLabel
-                ))));
+                msg = ( (new MarkdownString(( localizeWithPath(_moduleId, 2, "**{0}** for your current keyboard layout.", uiLabel)))));
             }
             className = 'keybindingInfo';
             overviewRulerColor = themeColorFromId(overviewRulerInfo);
         }
         const startPosition = model.getPositionAt(keyNode.offset);
         const endPosition = model.getPositionAt(keyNode.offset + keyNode.length);
-        const range = ( new Range(
+        const range = ( (new Range(
             startPosition.lineNumber,
             startPosition.column,
             endPosition.lineNumber,
             endPosition.column
-        ));
+        )));
         return {
             range: range,
             options: {
@@ -235,9 +219,9 @@ let KeybindingEditorDecorationsRenderer = KeybindingEditorDecorationsRenderer_1
         };
     }
 };
-KeybindingEditorDecorationsRenderer = KeybindingEditorDecorationsRenderer_1 = ( __decorate([
-    ( __param(1, IKeybindingService))
-], KeybindingEditorDecorationsRenderer));
+KeybindingEditorDecorationsRenderer = KeybindingEditorDecorationsRenderer_1 = ( (__decorate([
+    ( (__param(1, IKeybindingService)))
+], KeybindingEditorDecorationsRenderer)));
 function isInterestingEditorModel(editor, userDataProfileService) {
     const model = editor.getModel();
     if (!model) {