@codingame/monaco-vscode-keybindings-service-override 9.0.2 → 10.0.0

package/keybindings.js

@@ -30,7 +30,10 @@ import './vscode/src/vs/workbench/contrib/preferences/browser/keybindingsEditorC
 import './vscode/src/vs/workbench/contrib/commands/common/commands.contribution.js';
 import { getService } from 'vscode/services';
 
-const defaultUserKeybindindsFile = ( URI.from({ scheme: Schemas.vscodeUserData, path: '/User/keybindings.json' }));
+const defaultUserKeybindindsFile = ( URI.from({
+    scheme: Schemas.vscodeUserData,
+    path: '/User/keybindings.json'
+}));
 async function initUserKeybindings(configurationJson, options, file = defaultUserKeybindindsFile) {
     await initFile(file, configurationJson, options);
 }
@@ -71,7 +74,10 @@ let DynamicWorkbenchKeybindingService = class DynamicWorkbenchKeybindingService
         return super._dispatch(e, target);
     }
     getUserKeybindingItems() {
-        return [...super.getUserKeybindingItems(), ...this.keybindingProviders.flatMap(provider => provider.provideKeybindings())];
+        return [
+            ...super.getUserKeybindingItems(),
+            ...this.keybindingProviders.flatMap((provider) => provider.provideKeybindings())
+        ];
     }
 };
 DynamicWorkbenchKeybindingService = __decorate([

package/package.json

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

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

@@ -1,16 +1,11 @@
 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 { 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';
 
-var DispatchConfig;
-( ((function(DispatchConfig) {
-    DispatchConfig[DispatchConfig["Code"] = 0] = "Code";
-    DispatchConfig[DispatchConfig["KeyCode"] = 1] = "KeyCode";
-})(DispatchConfig || (DispatchConfig = {}))));
 function readKeyboardConfig(configurationService) {
     const keyboard = configurationService.getValue('keyboard');
-    const dispatch = (keyboard?.dispatch === 'keyCode' ? DispatchConfig.KeyCode : DispatchConfig.Code);
+    const dispatch = ((keyboard?.dispatch === 'keyCode' ? 1  : 0) );
     const mapAltGrToCtrlAlt = Boolean(keyboard?.mapAltGrToCtrlAlt);
     return { dispatch, mapAltGrToCtrlAlt };
 }
@@ -19,28 +14,28 @@ const keyboardConfiguration = {
     'id': 'keyboard',
     'order': 15,
     'type': 'object',
-    'title': ( localize(8715, "Keyboard")),
+    'title': ( localize(8782, "Keyboard")),
     'properties': {
         'keyboard.dispatch': {
-            scope: ConfigurationScope.APPLICATION,
+            scope: 1 ,
             type: 'string',
             enum: ['code', 'keyCode'],
             default: 'code',
             markdownDescription: ( localize(
-                8716,
+                8783,
                 "Controls the dispatching logic for key presses to use either `code` (recommended) or `keyCode`."
             )),
-            included: OS === OperatingSystem.Macintosh || OS === OperatingSystem.Linux
+            included: OS === 2  || OS === 3
         },
         'keyboard.mapAltGrToCtrlAlt': {
-            scope: ConfigurationScope.APPLICATION,
+            scope: 1 ,
             type: 'boolean',
             default: false,
-            markdownDescription: ( localize(8717, "Controls if the AltGraph+ modifier should be treated as Ctrl+Alt+.")),
-            included: OS === OperatingSystem.Windows
+            markdownDescription: ( localize(8784, "Controls if the AltGraph+ modifier should be treated as Ctrl+Alt+.")),
+            included: OS === 1
         }
     }
 };
 configurationRegistry.registerConfiguration(keyboardConfiguration);
 
-export { DispatchConfig, readKeyboardConfig };
+export { readKeyboardConfig };

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

@@ -5,14 +5,14 @@ import { setConstant } from 'vscode/vscode/vs/platform/contextkey/common/context
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsIOSContext, IsMobileContext, IsDevelopmentContext, ProductQualityContext, InputFocusedContext } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
 import { RemoteNameContext, VirtualWorkspaceContext, TemporaryWorkspaceContext, HasWebFileSystemAccess, EmbedderIdentifierContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, EditorsVisibleContext, DirtyWorkingCopiesContext, WorkbenchStateContext, WorkspaceFolderCountContext, OpenFolderWorkspaceSupportContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, SplitEditorsVertically, IsMainWindowFullscreenContext, IsAuxiliaryWindowFocusedContext, InEditorZenModeContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, EditorTabsVisibleContext, SideBarVisibleContext, TitleBarVisibleContext, TitleBarStyleContext, PanelPositionContext, PanelVisibleContext, PanelMaximizedContext, PanelAlignmentContext, AuxiliaryBarVisibleContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { onDidRegisterWindow, addDisposableListener, EventType, trackFocus, getActiveWindow } from 'vscode/vscode/vs/base/browser/dom';
-import { preferredSideBySideGroupDirection, GroupDirection } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
+import { onDidRegisterWindow, addDisposableListener, EventType, isEditableElement, trackFocus, getActiveWindow } from 'vscode/vscode/vs/base/browser/dom';
+import { preferredSideBySideGroupDirection } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
-import { WorkbenchState, isTemporaryWorkspace } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { isTemporaryWorkspace } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
-import { positionToString, Parts } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { positionToString } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService.service';
 import { getRemoteName } from 'vscode/vscode/vs/platform/remote/common/remoteHosts';
 import { getVirtualWorkspaceScheme } from 'vscode/vscode/vs/platform/workspace/common/virtualWorkspace';
@@ -90,13 +90,13 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
         this.panelPositionContext = PanelPositionContext.bindTo(this.contextKeyService);
         this.panelPositionContext.set(positionToString(this.layoutService.getPanelPosition()));
         this.panelVisibleContext = PanelVisibleContext.bindTo(this.contextKeyService);
-        this.panelVisibleContext.set(this.layoutService.isVisible(Parts.PANEL_PART));
+        this.panelVisibleContext.set(this.layoutService.isVisible("workbench.parts.panel" ));
         this.panelMaximizedContext = PanelMaximizedContext.bindTo(this.contextKeyService);
         this.panelMaximizedContext.set(this.layoutService.isPanelMaximized());
         this.panelAlignmentContext = PanelAlignmentContext.bindTo(this.contextKeyService);
         this.panelAlignmentContext.set(this.layoutService.getPanelAlignment());
         this.auxiliaryBarVisibleContext = AuxiliaryBarVisibleContext.bindTo(this.contextKeyService);
-        this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART));
+        this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible("workbench.parts.auxiliarybar" ));
         this.registerListeners();
     }
     registerListeners() {
@@ -136,10 +136,10 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
         this._register(this.paneCompositeService.onDidPaneCompositeClose(() => this.updateSideBarContextKeys()));
         this._register(this.paneCompositeService.onDidPaneCompositeOpen(() => this.updateSideBarContextKeys()));
         this._register(this.layoutService.onDidChangePartVisibility(() => {
-            this.mainEditorAreaVisibleContext.set(this.layoutService.isVisible(Parts.EDITOR_PART, mainWindow));
-            this.panelVisibleContext.set(this.layoutService.isVisible(Parts.PANEL_PART));
+            this.mainEditorAreaVisibleContext.set(this.layoutService.isVisible("workbench.parts.editor" , mainWindow));
+            this.panelVisibleContext.set(this.layoutService.isVisible("workbench.parts.panel" ));
             this.panelMaximizedContext.set(this.layoutService.isPanelMaximized());
-            this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART));
+            this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible("workbench.parts.auxiliarybar" ));
             this.updateTitleBarContextKeys();
         }));
         this._register(this.workingCopyService.onDidChangeDirty(workingCopy => this.dirtyWorkingCopiesContext.set(workingCopy.isDirty() || this.workingCopyService.hasDirty)));
@@ -181,7 +181,7 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
     }
     updateInputContextKeys(ownerDocument) {
         function activeElementIsInput() {
-            return !!ownerDocument.activeElement && (ownerDocument.activeElement.tagName === 'INPUT' || ownerDocument.activeElement.tagName === 'TEXTAREA');
+            return !!ownerDocument.activeElement && isEditableElement(ownerDocument.activeElement);
         }
         const isInputFocused = activeElementIsInput();
         this.inputFocusedContext.set(isInputFocused);
@@ -203,20 +203,20 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
     }
     updateSplitEditorsVerticallyContext() {
         const direction = preferredSideBySideGroupDirection(this.configurationService);
-        this.splitEditorsVerticallyContext.set(direction === GroupDirection.DOWN);
+        this.splitEditorsVerticallyContext.set(direction === 1 );
     }
     getWorkbenchStateString() {
         switch (this.contextService.getWorkbenchState()) {
-            case WorkbenchState.EMPTY: return 'empty';
-            case WorkbenchState.FOLDER: return 'folder';
-            case WorkbenchState.WORKSPACE: return 'workspace';
+            case 1 : return 'empty';
+            case 2 : return 'folder';
+            case 3 : return 'workspace';
         }
     }
     updateSideBarContextKeys() {
-        this.sideBarVisibleContext.set(this.layoutService.isVisible(Parts.SIDEBAR_PART));
+        this.sideBarVisibleContext.set(this.layoutService.isVisible("workbench.parts.sidebar" ));
     }
     updateTitleBarContextKeys() {
-        this.titleAreaVisibleContext.set(this.layoutService.isVisible(Parts.TITLEBAR_PART, mainWindow));
+        this.titleAreaVisibleContext.set(this.layoutService.isVisible("workbench.parts.titlebar" , mainWindow));
         this.titleBarStyleContext.set(getTitleBarStyle(this.configurationService));
     }
     updateWorkspaceContextKeys() {

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

@@ -9,10 +9,10 @@ class RunCommands extends Action2 {
     constructor() {
         super({
             id: 'runCommands',
-            title: ( localize2(3527, "Run Commands")),
+            title: ( localize2(3563, "Run Commands")),
             f1: false,
             metadata: {
-                description: ( localize(3528, "Run several commands")),
+                description: ( localize(3564, "Run several commands")),
                 args: [
                     {
                         name: 'args',
@@ -22,7 +22,7 @@ class RunCommands extends Action2 {
                             properties: {
                                 commands: {
                                     type: 'array',
-                                    description: ( localize(3529, "Commands to run")),
+                                    description: ( localize(3565, "Commands to run")),
                                     items: {
                                         anyOf: [
                                             {
@@ -62,14 +62,14 @@ class RunCommands extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!this._isCommandArgs(args)) {
             notificationService.error(( localize(
-                3530,
+                3566,
                 "'runCommands' has received an argument with incorrect type. Please, review the argument passed to the command."
             )));
             return;
         }
         if (args.commands.length === 0) {
             notificationService.warn(( localize(
-                3531,
+                3567,
                 "'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

@@ -9,7 +9,7 @@ class ToggleKeybindingsLogAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleKeybindingsLog',
-            title: ( localize2(3523, "Toggle Keyboard Shortcuts Troubleshooting")),
+            title: ( localize2(3559, "Toggle Keyboard Shortcuts Troubleshooting")),
             category: Categories.Developer,
             f1: true
         });

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

@@ -6,7 +6,7 @@ import { Disposable, MutableDisposable } from 'vscode/vscode/vs/base/common/life
 import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
-import { registerEditorContribution, EditorContributionInstantiation } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { registerEditorContribution } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { SnippetController2 } from 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetController2';
 import { SmartSnippetInserter } from '../common/smartSnippetInserter.js';
 import { DefineKeybindingOverlayWidget } from 'vscode/vscode/vs/workbench/contrib/preferences/browser/keybindingWidgets';
@@ -14,7 +14,7 @@ import { parseTree } from 'vscode/vscode/vs/base/common/json';
 import { WindowsNativeResolvedKeybinding } from '../../../services/keybinding/common/windowsKeyboardMapper.js';
 import { themeColorFromId } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { overviewRulerError, overviewRulerInfo } from 'vscode/vscode/vs/editor/common/core/editorColorRegistry';
-import { TrackedRangeStickiness, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
 import { KeybindingParser } from 'vscode/vscode/vs/base/common/keybindingParser';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
@@ -23,7 +23,7 @@ import { DEFINE_KEYBINDING_EDITOR_CONTRIB_ID } from 'vscode/vscode/vs/workbench/
 
 var KeybindingEditorDecorationsRenderer_1;
 const NLS_KB_LAYOUT_ERROR_MESSAGE = ( localize(
-    3524,
+    3560,
     "You won't be able to produce this key combination under your current keyboard layout."
 ));
 let DefineKeybindingEditorContribution = class DefineKeybindingEditorContribution extends Disposable {
@@ -181,14 +181,14 @@ let KeybindingEditorDecorationsRenderer = KeybindingEditorDecorationsRenderer_1
         else {
             if (usLabel && uiLabel !== usLabel) {
                 msg = ( (new MarkdownString(( localize(
-                    3525,
+                    3561,
                     "**{0}** for your current keyboard layout (**{1}** for US standard).",
                     uiLabel,
                     usLabel
                 )))));
             }
             else {
-                msg = ( (new MarkdownString(( localize(3526, "**{0}** for your current keyboard layout.", uiLabel)))));
+                msg = ( (new MarkdownString(( localize(3562, "**{0}** for your current keyboard layout.", uiLabel)))));
             }
             className = 'keybindingInfo';
             overviewRulerColor = themeColorFromId(overviewRulerInfo);
@@ -205,7 +205,7 @@ let KeybindingEditorDecorationsRenderer = KeybindingEditorDecorationsRenderer_1
             range: range,
             options: {
                 description: 'keybindings-widget',
-                stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+                stickiness: 1 ,
                 className: className,
                 hoverMessage: msg,
                 overviewRuler: {
@@ -226,6 +226,6 @@ function isInterestingEditorModel(editor, userDataProfileService) {
     }
     return isEqual(model.uri, userDataProfileService.currentProfile.keybindingsResource);
 }
-registerEditorContribution(DEFINE_KEYBINDING_EDITOR_CONTRIB_ID, DefineKeybindingEditorContribution, EditorContributionInstantiation.AfterFirstRender);
+registerEditorContribution(DEFINE_KEYBINDING_EDITOR_CONTRIB_ID, DefineKeybindingEditorContribution, 1 );
 
 export { KeybindingEditorDecorationsRenderer };

package/vscode/src/vs/workbench/contrib/preferences/common/smartSnippetInserter.js

@@ -1,12 +1,12 @@
-import { SyntaxKind, createScanner } from 'vscode/vscode/vs/base/common/json';
+import { createScanner } from 'vscode/vscode/vs/base/common/json';
 import { Position } from 'vscode/vscode/vs/editor/common/core/position';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 
 class SmartSnippetInserter {
     static hasOpenBrace(scanner) {
-        while (scanner.scan() !== SyntaxKind.EOF) {
+        while (scanner.scan() !== 17 ) {
             const kind = scanner.getToken();
-            if (kind === SyntaxKind.OpenBraceToken) {
+            if (kind === 1 ) {
                 return true;
             }
         }
@@ -53,37 +53,37 @@ class SmartSnippetInserter {
                 }
             }
         };
-        while (scanner.scan() !== SyntaxKind.EOF) {
+        while (scanner.scan() !== 17 ) {
             const currentPos = scanner.getPosition();
             const kind = scanner.getToken();
             let goodKind = false;
             switch (kind) {
-                case SyntaxKind.OpenBracketToken:
+                case 3 :
                     goodKind = true;
                     arrayLevel++;
                     checkRangeStatus(currentPos, State.BEFORE_OBJECT);
                     break;
-                case SyntaxKind.CloseBracketToken:
+                case 4 :
                     goodKind = true;
                     arrayLevel--;
                     checkRangeStatus(currentPos, State.INVALID);
                     break;
-                case SyntaxKind.CommaToken:
+                case 5 :
                     goodKind = true;
                     checkRangeStatus(currentPos, State.BEFORE_OBJECT);
                     break;
-                case SyntaxKind.OpenBraceToken:
+                case 1 :
                     goodKind = true;
                     objLevel++;
                     checkRangeStatus(currentPos, State.INVALID);
                     break;
-                case SyntaxKind.CloseBraceToken:
+                case 2 :
                     goodKind = true;
                     objLevel--;
                     checkRangeStatus(currentPos, State.AFTER_OBJECT);
                     break;
-                case SyntaxKind.Trivia:
-                case SyntaxKind.LineBreakTrivia:
+                case 15 :
+                case 14 :
                     goodKind = true;
             }
             if (currentPos >= desiredPosition && (currentState !== State.INVALID || lastValidPos !== -1)) {