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

package/package.json

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

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

@@ -1,12 +1,17 @@
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { OS } from 'vscode/vscode/vs/base/common/platform';
-import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+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";
+    DispatchConfig[DispatchConfig["KeyCode"] = 1] = "KeyCode";
+})(DispatchConfig || (DispatchConfig = {}))));
 function readKeyboardConfig(configurationService) {
     const keyboard = configurationService.getValue('keyboard');
-    const dispatch = ((keyboard?.dispatch === 'keyCode' ? 1  : 0) );
+    const dispatch = (keyboard?.dispatch === 'keyCode' ? DispatchConfig.KeyCode : DispatchConfig.Code);
     const mapAltGrToCtrlAlt = Boolean(keyboard?.mapAltGrToCtrlAlt);
     return { dispatch, mapAltGrToCtrlAlt };
 }
@@ -18,7 +23,7 @@ const keyboardConfiguration = {
     'title': ( localizeWithPath(_moduleId, 0, "Keyboard")),
     'properties': {
         'keyboard.dispatch': {
-            scope: 1 ,
+            scope: ConfigurationScope.APPLICATION,
             type: 'string',
             enum: ['code', 'keyCode'],
             default: 'code',
@@ -27,10 +32,10 @@ const keyboardConfiguration = {
                 1,
                 "Controls the dispatching logic for key presses to use either `code` (recommended) or `keyCode`."
             )),
-            included: OS === 2  || OS === 3
+            included: OS === OperatingSystem.Macintosh || OS === OperatingSystem.Linux
         },
         'keyboard.mapAltGrToCtrlAlt': {
-            scope: 1 ,
+            scope: ConfigurationScope.APPLICATION,
             type: 'boolean',
             default: false,
             markdownDescription: ( localizeWithPath(
@@ -38,10 +43,10 @@ const keyboardConfiguration = {
                 2,
                 "Controls if the AltGraph+ modifier should be treated as Ctrl+Alt+."
             )),
-            included: OS === 1
+            included: OS === OperatingSystem.Windows
         }
     }
 };
 configurationRegistry.registerConfiguration(keyboardConfiguration);
 
-export { readKeyboardConfig };
+export { DispatchConfig, readKeyboardConfig };

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

@@ -4,48 +4,41 @@ import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { setConstant } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 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, ActiveEditorContext, ActiveEditorReadonlyContext, ActiveCompareEditorCanSwapContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorAvailableEditorIdsContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, SideBySideEditorActiveContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, DirtyWorkingCopiesContext, WorkbenchStateContext, WorkspaceFolderCountContext, OpenFolderWorkspaceSupportContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, SplitEditorsVertically, IsMainWindowFullscreenContext, IsAuxiliaryWindowFocusedContext, InEditorZenModeContext, IsMainEditorCenteredLayoutContext, MainEditorAreaVisibleContext, EditorTabsVisibleContext, SideBarVisibleContext, TitleBarVisibleContext, TitleBarStyleContext, PanelPositionContext, PanelVisibleContext, PanelMaximizedContext, PanelAlignmentContext, AuxiliaryBarVisibleContext, applyAvailableEditorIds } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { TEXT_DIFF_EDITOR_ID, SIDE_BY_SIDE_EDITOR_ID, EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
+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 } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
+import { preferredSideBySideGroupDirection, GroupDirection } 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 { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { isTemporaryWorkspace } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { WorkbenchState, isTemporaryWorkspace } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
-import { positionToString } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
+import { positionToString, Parts } 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';
 import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
 import { isNative } from 'vscode/vscode/vs/base/common/platform';
-import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service';
 import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
 import { WebFileSystemAccess } from 'vscode/vscode/vs/platform/files/browser/webFileSystemAccess';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { getTitleBarStyle } from 'vscode/vscode/vs/platform/window/common/window';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
-import { DiffEditorInput } from 'vscode/vscode/vs/workbench/common/editor/diffEditorInput';
 import { onDidChangeFullscreen, isFullscreen } from 'vscode/vscode/vs/base/browser/browser';
-import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
 let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disposable {
-    constructor(contextKeyService, contextService, configurationService, environmentService, productService, editorService, editorResolverService, editorGroupService, layoutService, paneCompositeService, workingCopyService, fileService) {
+    constructor(contextKeyService, contextService, configurationService, environmentService, productService, editorGroupService, editorService, layoutService, paneCompositeService, workingCopyService) {
         super();
         this.contextKeyService = contextKeyService;
         this.contextService = contextService;
         this.configurationService = configurationService;
         this.environmentService = environmentService;
         this.productService = productService;
-        this.editorService = editorService;
-        this.editorResolverService = editorResolverService;
         this.editorGroupService = editorGroupService;
+        this.editorService = editorService;
         this.layoutService = layoutService;
         this.paneCompositeService = paneCompositeService;
         this.workingCopyService = workingCopyService;
-        this.fileService = fileService;
         IsMacContext.bindTo(this.contextKeyService);
         IsLinuxContext.bindTo(this.contextKeyService);
         IsWindowsContext.bindTo(this.contextKeyService);
@@ -63,22 +56,12 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
         setConstant(IsDevelopmentContext.key, isDevelopment);
         ProductQualityContext.bindTo(this.contextKeyService).set(this.productService.quality || '');
         EmbedderIdentifierContext.bindTo(this.contextKeyService).set(productService.embedderIdentifier);
-        this.activeEditorContext = ActiveEditorContext.bindTo(this.contextKeyService);
-        this.activeEditorIsReadonly = ActiveEditorReadonlyContext.bindTo(this.contextKeyService);
-        this.activeCompareEditorCanSwap = ActiveCompareEditorCanSwapContext.bindTo(this.contextKeyService);
-        this.activeEditorCanToggleReadonly = ActiveEditorCanToggleReadonlyContext.bindTo(this.contextKeyService);
-        this.activeEditorCanRevert = ActiveEditorCanRevertContext.bindTo(this.contextKeyService);
-        this.activeEditorCanSplitInGroup = ActiveEditorCanSplitInGroupContext.bindTo(this.contextKeyService);
-        this.activeEditorAvailableEditorIds = ActiveEditorAvailableEditorIdsContext.bindTo(this.contextKeyService);
-        this.editorsVisibleContext = EditorsVisibleContext.bindTo(this.contextKeyService);
-        this.textCompareEditorVisibleContext = TextCompareEditorVisibleContext.bindTo(this.contextKeyService);
-        this.textCompareEditorActiveContext = TextCompareEditorActiveContext.bindTo(this.contextKeyService);
-        this.sideBySideEditorActiveContext = SideBySideEditorActiveContext.bindTo(this.contextKeyService);
         this.activeEditorGroupEmpty = ActiveEditorGroupEmptyContext.bindTo(this.contextKeyService);
         this.activeEditorGroupIndex = ActiveEditorGroupIndexContext.bindTo(this.contextKeyService);
         this.activeEditorGroupLast = ActiveEditorGroupLastContext.bindTo(this.contextKeyService);
         this.activeEditorGroupLocked = ActiveEditorGroupLockedContext.bindTo(this.contextKeyService);
         this.multipleEditorGroupsContext = MultipleEditorGroupsContext.bindTo(this.contextKeyService);
+        this.editorsVisibleContext = EditorsVisibleContext.bindTo(this.contextKeyService);
         this.dirtyWorkingCopiesContext = DirtyWorkingCopiesContext.bindTo(this.contextKeyService);
         this.dirtyWorkingCopiesContext.set(this.workingCopyService.hasDirty);
         this.inputFocusedContext = InputFocusedContext.bindTo(this.contextKeyService);
@@ -107,27 +90,28 @@ 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("workbench.parts.panel" ));
+        this.panelVisibleContext.set(this.layoutService.isVisible(Parts.PANEL_PART));
         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("workbench.parts.auxiliarybar" ));
+        this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART));
         this.registerListeners();
     }
     registerListeners() {
         this.editorGroupService.whenReady.then(() => {
             this.updateEditorAreaContextKeys();
-            this.updateEditorContextKeys();
+            this.updateEditorGroupContextKeys();
+            this.updateVisiblePanesContextKeys();
         });
-        this._register(this.editorService.onDidActiveEditorChange(() => this.updateEditorContextKeys()));
-        this._register(this.editorService.onDidVisibleEditorsChange(() => this.updateEditorContextKeys()));
-        this._register(this.editorGroupService.onDidAddGroup(() => this.updateEditorContextKeys()));
-        this._register(this.editorGroupService.onDidRemoveGroup(() => this.updateEditorContextKeys()));
-        this._register(this.editorGroupService.onDidChangeGroupIndex(() => this.updateEditorContextKeys()));
-        this._register(this.editorGroupService.onDidChangeActiveGroup(() => this.updateEditorGroupContextKeys()));
-        this._register(this.editorGroupService.onDidChangeGroupLocked(() => this.updateEditorGroupContextKeys()));
+        this._register(this.editorService.onDidActiveEditorChange(() => this.updateEditorGroupContextKeys()));
+        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.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()));
@@ -153,58 +137,33 @@ 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("workbench.parts.editor" , mainWindow));
-            this.panelVisibleContext.set(this.layoutService.isVisible("workbench.parts.panel" ));
+            this.mainEditorAreaVisibleContext.set(this.layoutService.isVisible(Parts.EDITOR_PART, mainWindow));
+            this.panelVisibleContext.set(this.layoutService.isVisible(Parts.PANEL_PART));
             this.panelMaximizedContext.set(this.layoutService.isPanelMaximized());
-            this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible("workbench.parts.auxiliarybar" ));
+            this.auxiliaryBarVisibleContext.set(this.layoutService.isVisible(Parts.AUXILIARYBAR_PART));
             this.updateTitleBarContextKeys();
         }));
         this._register(this.workingCopyService.onDidChangeDirty(workingCopy => this.dirtyWorkingCopiesContext.set(workingCopy.isDirty() || this.workingCopyService.hasDirty)));
     }
-    updateEditorAreaContextKeys() {
-        this.editorTabsVisibleContext.set(this.editorGroupService.partOptions.showTabs === 'multiple');
-    }
-    updateEditorContextKeys() {
-        const activeEditorPane = this.editorService.activeEditorPane;
+    updateVisiblePanesContextKeys() {
         const visibleEditorPanes = this.editorService.visibleEditorPanes;
-        this.textCompareEditorActiveContext.set(activeEditorPane?.getId() === TEXT_DIFF_EDITOR_ID);
-        this.textCompareEditorVisibleContext.set(( visibleEditorPanes.some(editorPane => editorPane.getId() === TEXT_DIFF_EDITOR_ID)));
-        this.sideBySideEditorActiveContext.set(activeEditorPane?.getId() === SIDE_BY_SIDE_EDITOR_ID);
         if (visibleEditorPanes.length > 0) {
             this.editorsVisibleContext.set(true);
         }
         else {
             this.editorsVisibleContext.reset();
         }
+    }
+    updateEditorGroupContextKeys() {
         if (!this.editorService.activeEditor) {
             this.activeEditorGroupEmpty.set(true);
         }
         else {
             this.activeEditorGroupEmpty.reset();
         }
-        this.updateEditorGroupContextKeys();
-        if (activeEditorPane) {
-            this.activeEditorContext.set(activeEditorPane.getId());
-            this.activeEditorCanRevert.set(!activeEditorPane.input.hasCapability(4 ));
-            this.activeEditorCanSplitInGroup.set(activeEditorPane.input.hasCapability(32 ));
-            applyAvailableEditorIds(this.activeEditorAvailableEditorIds, activeEditorPane.input, this.editorResolverService);
-            this.activeEditorIsReadonly.set(!!activeEditorPane.input.isReadonly());
-            const primaryEditorResource = EditorResourceAccessor.getOriginalUri(activeEditorPane.input, { supportSideBySide: SideBySideEditor.PRIMARY });
-            const secondaryEditorResource = EditorResourceAccessor.getOriginalUri(activeEditorPane.input, { supportSideBySide: SideBySideEditor.SECONDARY });
-            this.activeCompareEditorCanSwap.set(activeEditorPane.input instanceof DiffEditorInput && !activeEditorPane.input.original.isReadonly() && !!primaryEditorResource && (this.fileService.hasProvider(primaryEditorResource) || primaryEditorResource.scheme === Schemas.untitled) && !!secondaryEditorResource && (this.fileService.hasProvider(secondaryEditorResource) || secondaryEditorResource.scheme === Schemas.untitled));
-            this.activeEditorCanToggleReadonly.set(!!primaryEditorResource && this.fileService.hasProvider(primaryEditorResource) && !this.fileService.hasCapability(primaryEditorResource, 2048 ));
-        }
-        else {
-            this.activeEditorContext.reset();
-            this.activeEditorIsReadonly.reset();
-            this.activeCompareEditorCanSwap.reset();
-            this.activeEditorCanToggleReadonly.reset();
-            this.activeEditorCanRevert.reset();
-            this.activeEditorCanSplitInGroup.reset();
-            this.activeEditorAvailableEditorIds.reset();
-        }
+        this.updateEditorGroupsContextKeys();
     }
-    updateEditorGroupContextKeys() {
+    updateEditorGroupsContextKeys() {
         const groupCount = this.editorGroupService.count;
         if (groupCount > 1) {
             this.multipleEditorGroupsContext.set(true);
@@ -217,6 +176,9 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
         this.activeEditorGroupLast.set(activeGroup.index === groupCount - 1);
         this.activeEditorGroupLocked.set(activeGroup.isLocked);
     }
+    updateEditorAreaContextKeys() {
+        this.editorTabsVisibleContext.set(this.editorGroupService.partOptions.showTabs === 'multiple');
+    }
     updateInputContextKeys(ownerDocument) {
         function activeElementIsInput() {
             return !!ownerDocument.activeElement && (ownerDocument.activeElement.tagName === 'INPUT' || ownerDocument.activeElement.tagName === 'TEXTAREA');
@@ -241,20 +203,20 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
     }
     updateSplitEditorsVerticallyContext() {
         const direction = preferredSideBySideGroupDirection(this.configurationService);
-        this.splitEditorsVerticallyContext.set(direction === 1 );
+        this.splitEditorsVerticallyContext.set(direction === GroupDirection.DOWN);
     }
     getWorkbenchStateString() {
         switch (this.contextService.getWorkbenchState()) {
-            case 1 : return 'empty';
-            case 2 : return 'folder';
-            case 3 : return 'workspace';
+            case WorkbenchState.EMPTY: return 'empty';
+            case WorkbenchState.FOLDER: return 'folder';
+            case WorkbenchState.WORKSPACE: return 'workspace';
         }
     }
     updateSideBarContextKeys() {
-        this.sideBarVisibleContext.set(this.layoutService.isVisible("workbench.parts.sidebar" ));
+        this.sideBarVisibleContext.set(this.layoutService.isVisible(Parts.SIDEBAR_PART));
     }
     updateTitleBarContextKeys() {
-        this.titleAreaVisibleContext.set(this.layoutService.isVisible("workbench.parts.titlebar" , mainWindow));
+        this.titleAreaVisibleContext.set(this.layoutService.isVisible(Parts.TITLEBAR_PART, mainWindow));
         this.titleBarStyleContext.set(getTitleBarStyle(this.configurationService));
     }
     updateWorkspaceContextKeys() {
@@ -268,13 +230,11 @@ WorkbenchContextKeysHandler = ( __decorate([
     ( __param(2, IConfigurationService)),
     ( __param(3, IWorkbenchEnvironmentService)),
     ( __param(4, IProductService)),
-    ( __param(5, IEditorService)),
-    ( __param(6, IEditorResolverService)),
-    ( __param(7, IEditorGroupsService)),
-    ( __param(8, IWorkbenchLayoutService)),
-    ( __param(9, IPaneCompositePartService)),
-    ( __param(10, IWorkingCopyService)),
-    ( __param(11, IFileService))
+    ( __param(5, IEditorGroupsService)),
+    ( __param(6, IEditorService)),
+    ( __param(7, IWorkbenchLayoutService)),
+    ( __param(8, IPaneCompositePartService)),
+    ( __param(9, IWorkingCopyService))
 ], WorkbenchContextKeysHandler));
 
 export { WorkbenchContextKeysHandler };

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

@@ -1,3 +1,4 @@
+import { safeStringify } from 'vscode/vscode/vs/base/common/objects';
 import { localize2WithPath, localizeWithPath } 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';
@@ -82,13 +83,13 @@ class RunCommands extends Action2 {
         try {
             for (; i < args.commands.length; ++i) {
                 const cmd = args.commands[i];
-                logService.debug(`runCommands: executing ${i}-th command: ${JSON.stringify(cmd)}`);
-                const r = await this._runCommand(commandService, cmd);
-                logService.debug(`runCommands: executed ${i}-th command with return value: ${JSON.stringify(r)}`);
+                logService.debug(`runCommands: executing ${i}-th command: ${safeStringify(cmd)}`);
+                await this._runCommand(commandService, cmd);
+                logService.debug(`runCommands: executed ${i}-th command`);
             }
         }
         catch (err) {
-            logService.debug(`runCommands: executing ${i}-th command resulted in an error: ${err instanceof Error ? err.message : JSON.stringify(err)}`);
+            logService.debug(`runCommands: executing ${i}-th command resulted in an error: ${err instanceof Error ? err.message : safeStringify(err)}`);
             notificationService.error(err);
         }
     }

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 } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { registerEditorContribution, EditorContributionInstantiation } 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 { OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
+import { TrackedRangeStickiness, 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';
@@ -208,7 +208,7 @@ let KeybindingEditorDecorationsRenderer = KeybindingEditorDecorationsRenderer_1
             range: range,
             options: {
                 description: 'keybindings-widget',
-                stickiness: 1 ,
+                stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
                 className: className,
                 hoverMessage: msg,
                 overviewRuler: {
@@ -229,6 +229,6 @@ function isInterestingEditorModel(editor, userDataProfileService) {
     }
     return isEqual(model.uri, userDataProfileService.currentProfile.keybindingsResource);
 }
-registerEditorContribution(DEFINE_KEYBINDING_EDITOR_CONTRIB_ID, DefineKeybindingEditorContribution, 1 );
+registerEditorContribution(DEFINE_KEYBINDING_EDITOR_CONTRIB_ID, DefineKeybindingEditorContribution, EditorContributionInstantiation.AfterFirstRender);
 
 export { KeybindingEditorDecorationsRenderer };

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

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

package/vscode/src/vs/workbench/services/commands/common/commandService.js

@@ -5,6 +5,7 @@ import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extension
 import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { timeout } from 'vscode/vscode/vs/base/common/async';
 
 let CommandService = class CommandService extends Disposable {