@codingame/monaco-vscode-keybindings-service-override 7.1.0 → 7.1.1

package/package.json

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

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

@@ -1,9 +1,8 @@
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { OS, OperatingSystem } from 'vscode/vscode/vs/base/common/platform';
 import { Extensions, ConfigurationScope } 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";
 var DispatchConfig;
 ( ((function(DispatchConfig) {
     DispatchConfig[DispatchConfig["Code"] = 0] = "Code";
@@ -20,16 +19,15 @@ const keyboardConfiguration = {
     'id': 'keyboard',
     'order': 15,
     'type': 'object',
-    'title': ( localizeWithPath(_moduleId, 0, "Keyboard")),
+    'title': ( localize(8664, "Keyboard")),
     'properties': {
         'keyboard.dispatch': {
             scope: ConfigurationScope.APPLICATION,
             type: 'string',
             enum: ['code', 'keyCode'],
             default: 'code',
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                1,
+            markdownDescription: ( localize(
+                8665,
                 "Controls the dispatching logic for key presses to use either `code` (recommended) or `keyCode`."
             )),
             included: OS === OperatingSystem.Macintosh || OS === OperatingSystem.Linux
@@ -38,11 +36,7 @@ const keyboardConfiguration = {
             scope: ConfigurationScope.APPLICATION,
             type: 'boolean',
             default: false,
-            markdownDescription: ( localizeWithPath(
-                _moduleId,
-                2,
-                "Controls if the AltGraph+ modifier should be treated as Ctrl+Alt+."
-            )),
+            markdownDescription: ( localize(8666, "Controls if the AltGraph+ modifier should be treated as Ctrl+Alt+.")),
             included: OS === OperatingSystem.Windows
         }
     }

package/vscode/src/vs/workbench/browser/contextkeys.js

@@ -102,16 +102,15 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
     registerListeners() {
         this.editorGroupService.whenReady.then(() => {
             this.updateEditorAreaContextKeys();
-            this.updateEditorGroupContextKeys();
+            this.updateActiveEditorGroupContextKeys();
             this.updateVisiblePanesContextKeys();
         });
-        this._register(this.editorService.onDidActiveEditorChange(() => this.updateEditorGroupContextKeys()));
+        this._register(this.editorService.onDidActiveEditorChange(() => this.updateActiveEditorGroupContextKeys()));
         this._register(this.editorService.onDidVisibleEditorsChange(() => this.updateVisiblePanesContextKeys()));
-        this._register(this.editorGroupService.onDidAddGroup(() => this.updateEditorGroupContextKeys()));
-        this._register(this.editorGroupService.onDidRemoveGroup(() => this.updateEditorGroupContextKeys()));
-        this._register(this.editorGroupService.onDidChangeGroupIndex(() => this.updateEditorGroupContextKeys()));
-        this._register(this.editorGroupService.onDidChangeActiveGroup(() => this.updateEditorGroupsContextKeys()));
-        this._register(this.editorGroupService.onDidChangeGroupLocked(() => this.updateEditorGroupsContextKeys()));
+        this._register(this.editorGroupService.onDidAddGroup(() => this.updateEditorGroupsContextKeys()));
+        this._register(this.editorGroupService.onDidRemoveGroup(() => this.updateEditorGroupsContextKeys()));
+        this._register(this.editorGroupService.onDidChangeGroupIndex(() => this.updateActiveEditorGroupContextKeys()));
+        this._register(this.editorGroupService.onDidChangeGroupLocked(() => this.updateActiveEditorGroupContextKeys()));
         this._register(this.editorGroupService.onDidChangeEditorPartOptions(() => this.updateEditorAreaContextKeys()));
         this._register(Event.runAndSubscribe(onDidRegisterWindow, ({ window, disposables }) => disposables.add(addDisposableListener(window, EventType.FOCUS_IN, () => this.updateInputContextKeys(window.document), true)), { window: mainWindow, disposables: this._store }));
         this._register(this.contextService.onDidChangeWorkbenchState(() => this.updateWorkbenchStateContextKey()));
@@ -154,13 +153,16 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
             this.editorsVisibleContext.reset();
         }
     }
-    updateEditorGroupContextKeys() {
+    updateActiveEditorGroupContextKeys() {
         if (!this.editorService.activeEditor) {
             this.activeEditorGroupEmpty.set(true);
         }
         else {
             this.activeEditorGroupEmpty.reset();
         }
+        const activeGroup = this.editorGroupService.activeGroup;
+        this.activeEditorGroupIndex.set(activeGroup.index + 1);
+        this.activeEditorGroupLocked.set(activeGroup.isLocked);
         this.updateEditorGroupsContextKeys();
     }
     updateEditorGroupsContextKeys() {
@@ -172,9 +174,7 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
             this.multipleEditorGroupsContext.reset();
         }
         const activeGroup = this.editorGroupService.activeGroup;
-        this.activeEditorGroupIndex.set(activeGroup.index + 1);
         this.activeEditorGroupLast.set(activeGroup.index === groupCount - 1);
-        this.activeEditorGroupLocked.set(activeGroup.isLocked);
     }
     updateEditorAreaContextKeys() {
         this.editorTabsVisibleContext.set(this.editorGroupService.partOptions.showTabs === 'multiple');

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

@@ -1,19 +1,18 @@
 import { safeStringify } from 'vscode/vscode/vs/base/common/objects';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } from 'vscode/vscode/vs/nls';
 import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
 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(_moduleId, 0, "Run Commands")),
+            title: ( localize2(3529, "Run Commands")),
             f1: false,
             metadata: {
-                description: ( localizeWithPath(_moduleId, 1, "Run several commands")),
+                description: ( localize(3530, "Run several commands")),
                 args: [
                     {
                         name: 'args',
@@ -23,7 +22,7 @@ class RunCommands extends Action2 {
                             properties: {
                                 commands: {
                                     type: 'array',
-                                    description: ( localizeWithPath(_moduleId, 2, "Commands to run")),
+                                    description: ( localize(3531, "Commands to run")),
                                     items: {
                                         anyOf: [
                                             {
@@ -62,17 +61,15 @@ class RunCommands extends Action2 {
     async run(accessor, args) {
         const notificationService = accessor.get(INotificationService);
         if (!this._isCommandArgs(args)) {
-            notificationService.error(( localizeWithPath(
-                _moduleId,
-                3,
+            notificationService.error(( localize(
+                3532,
                 "'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(
-                _moduleId,
-                4,
+            notificationService.warn(( localize(
+                3533,
                 "'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

@@ -1,16 +1,15 @@
-import { localize2WithPath } from 'vscode/vscode/vs/nls';
+import { localize2 } from 'vscode/vscode/vs/nls';
 import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 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(_moduleId, 0, "Toggle Keyboard Shortcuts Troubleshooting")),
+            title: ( localize2(3525, "Toggle Keyboard Shortcuts Troubleshooting")),
             category: Categories.Developer,
             f1: true
         });

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
 import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -22,10 +22,8 @@ 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(
-    _moduleId,
-    0,
+const NLS_KB_LAYOUT_ERROR_MESSAGE = ( localize(
+    3526,
     "You won't be able to produce this key combination under your current keyboard layout."
 ));
 let DefineKeybindingEditorContribution = class DefineKeybindingEditorContribution extends Disposable {
@@ -182,16 +180,15 @@ let KeybindingEditorDecorationsRenderer = KeybindingEditorDecorationsRenderer_1
         }
         else {
             if (usLabel && uiLabel !== usLabel) {
-                msg = ( (new MarkdownString(( localizeWithPath(
-                    _moduleId,
-                    1,
+                msg = ( (new MarkdownString(( localize(
+                    3527,
                     "**{0}** for your current keyboard layout (**{1}** for US standard).",
                     uiLabel,
                     usLabel
                 )))));
             }
             else {
-                msg = ( (new MarkdownString(( localizeWithPath(_moduleId, 2, "**{0}** for your current keyboard layout.", uiLabel)))));
+                msg = ( (new MarkdownString(( localize(3528, "**{0}** for your current keyboard layout.", uiLabel)))));
             }
             className = 'keybindingInfo';
             overviewRulerColor = themeColorFromId(overviewRulerInfo);