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

package/index.d.ts

@@ -1,2 +1,19 @@
-export * from 'vscode/service-override/keybindings';
-export { default } from 'vscode/service-override/keybindings';
+import type { IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+import type { IUserFriendlyKeybinding } from "vscode/vscode/vs/platform/keybinding/common/keybinding";
+import type { IFileWriteOptions } from "vscode/vscode/vs/platform/files/common/files";
+import { URI } from "vscode/vscode/vs/base/common/uri";
+declare const defaultUserKeybindindsFile: URI;
+/**
+ * Should be called only BEFORE the service are initialized to initialize the file on the filesystem before the keybindings service initializes
+ */
+declare function initUserKeybindings(configurationJson: string, options?: Partial<IFileWriteOptions>, file?: URI): Promise<void>;
+/**
+ * Can be called at any time after the services are initialized to update the user configuration
+ */
+declare function updateUserKeybindings(keybindingsJson: string): Promise<void>;
+interface KeybindingsProps {
+    shouldUseGlobalKeybindings?: () => boolean;
+}
+export default function getServiceOverride({ shouldUseGlobalKeybindings }?: KeybindingsProps): IEditorOverrideServices;
+export { defaultUserKeybindindsFile, initUserKeybindings, updateUserKeybindings };
+export type { IUserFriendlyKeybinding };

package/index.js

@@ -1 +1,110 @@
-export { default, defaultUserKeybindindsFile, initUserKeybindings, updateUserKeybindings } from './keybindings.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { WorkbenchKeybindingService } from './vscode/src/vs/workbench/services/keybinding/browser/keybindingService.js';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
+import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
+import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
+import { IKeyboardLayoutService } from 'vscode/vscode/vs/platform/keyboardLayout/common/keyboardLayout.service';
+import { BrowserKeyboardLayoutService } from './vscode/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.js';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { CommandService } from './vscode/src/vs/workbench/services/commands/common/commandService.js';
+import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import 'vscode/vscode/vs/platform/keybinding/common/keybindingResolver';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
+import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { WorkbenchContextKeysHandler } from './vscode/src/vs/workbench/browser/contextkeys.js';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import getServiceOverride$1, { initFile } from '@codingame/monaco-vscode-files-service-override';
+import { onRenderWorkbench } from 'vscode/lifecycle';
+import '@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common/vscode/vs/workbench/browser/workbench.contribution';
+import './vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js';
+import './vscode/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.js';
+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'
+});
+async function initUserKeybindings(configurationJson, options, file = defaultUserKeybindindsFile) {
+    await initFile(file, configurationJson, options);
+}
+async function updateUserKeybindings(keybindingsJson) {
+    const userDataProfilesService = await getService(IUserDataProfilesService);
+    const fileService = await getService(IFileService);
+    await fileService.writeFile(userDataProfilesService.defaultProfile.keybindingsResource, VSBuffer.fromString(keybindingsJson));
+}
+let DynamicWorkbenchKeybindingService = class DynamicWorkbenchKeybindingService extends WorkbenchKeybindingService {
+    constructor(shouldUseGlobalKeybindings, contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService) {
+        super(contextKeyService, commandService, telemetryService, notificationService, userDataProfileService, hostService, extensionService, fileService, uriIdentityService, logService, keyboardLayoutService);
+        this.shouldUseGlobalKeybindings = shouldUseGlobalKeybindings;
+        this.keybindingProviders = [];
+    }
+    registerKeybindingProvider(provider) {
+        this.keybindingProviders.push(provider);
+        this.updateResolver();
+        const store = new DisposableStore();
+        store.add(provider.onDidChangeKeybindings(() => {
+            this.updateResolver();
+        }));
+        store.add(toDisposable(() => {
+            const idx = this.keybindingProviders.indexOf(provider);
+            if (idx >= 0) {
+                this.keybindingProviders.splice(idx, 1);
+                this.updateResolver();
+            }
+        }));
+        return store;
+    }
+    _getResolver() {
+        return super._getResolver();
+    }
+    _dispatch(e, target) {
+        if (!this.shouldUseGlobalKeybindings()) {
+            return false;
+        }
+        return super._dispatch(e, target);
+    }
+    getUserKeybindingItems() {
+        return [
+            ...super.getUserKeybindingItems(),
+            ...this.keybindingProviders.flatMap((provider) => provider.provideKeybindings())
+        ];
+    }
+};
+DynamicWorkbenchKeybindingService = __decorate([
+    __param(1, IContextKeyService),
+    __param(2, ICommandService),
+    __param(3, ITelemetryService),
+    __param(4, INotificationService),
+    __param(5, IUserDataProfileService),
+    __param(6, IHostService),
+    __param(7, IExtensionService),
+    __param(8, IFileService),
+    __param(9, IUriIdentityService),
+    __param(10, ILogService),
+    __param(11, IKeyboardLayoutService)
+], DynamicWorkbenchKeybindingService);
+onRenderWorkbench((accessor) => {
+    accessor.get(IInstantiationService).createInstance(WorkbenchContextKeysHandler);
+});
+function getServiceOverride({ shouldUseGlobalKeybindings = () => false } = {}) {
+    return {
+        ...getServiceOverride$1(),
+        [IKeybindingService.toString()]: new SyncDescriptor(DynamicWorkbenchKeybindingService, [shouldUseGlobalKeybindings], false),
+        [IKeyboardLayoutService.toString()]: new SyncDescriptor(BrowserKeyboardLayoutService, [], true),
+        [ICommandService.toString()]: new SyncDescriptor(CommandService, [], true)
+    };
+}
+
+export { getServiceOverride as default, defaultUserKeybindindsFile, initUserKeybindings, updateUserKeybindings };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-keybindings-service-override",
-  "version": "11.1.2",
+  "version": "12.0.1",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - keybindings service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,18 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - keybindings service-override",
+  "dependencies": {
+    "@codingame/monaco-vscode-2a22c7b4-b906-5914-8cd1-3ed912fb738f-common": "12.0.1",
+    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "12.0.1",
+    "@codingame/monaco-vscode-4a36e358-d94d-55e0-86ee-3bcd543d9d3f-common": "12.0.1",
+    "@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common": "12.0.1",
+    "@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common": "12.0.1",
+    "@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common": "12.0.1",
+    "@codingame/monaco-vscode-files-service-override": "12.0.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.1"
+  },
+  "peerDependencies": {},
+  "peerDependenciesMeta": {},
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,11 +34,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js"
+      "default": "./vscode/src/*.js",
+      "types": "./vscode/src/*.d.ts"
+    },
+    "./*": {
+      "default": "./*.js",
+      "types": "./*.d.ts"
     }
-  },
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@11.1.2",
-    "@codingame/monaco-vscode-files-service-override": "11.1.2"
   }
 }

package/vscode/src/vs/platform/keyboardLayout/common/keyboardConfig.d.ts

@@ -0,0 +1,10 @@
+import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
+export declare enum DispatchConfig {
+    Code = 0,
+    KeyCode = 1
+}
+export interface IKeyboardConfig {
+    dispatch: DispatchConfig;
+    mapAltGrToCtrlAlt: boolean;
+}
+export declare function readKeyboardConfig(configurationService: IConfigurationService): IKeyboardConfig;

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

@@ -1,41 +1,47 @@
+
 import { localize } 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';
 
+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 };
 }
-const configurationRegistry = ( (Registry.as(Extensions.Configuration)));
+const configurationRegistry = ( Registry.as(Extensions.Configuration));
 const keyboardConfiguration = {
     'id': 'keyboard',
     'order': 15,
     'type': 'object',
-    'title': ( localize(8871, "Keyboard")),
+    'title': ( localize(1784, "Keyboard")),
     'properties': {
         'keyboard.dispatch': {
-            scope: 1 ,
+            scope: ConfigurationScope.APPLICATION,
             type: 'string',
             enum: ['code', 'keyCode'],
             default: 'code',
             markdownDescription: ( localize(
-                8872,
+                1785,
                 "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: ( localize(8873, "Controls if the AltGraph+ modifier should be treated as Ctrl+Alt+.")),
-            included: OS === 1
+            markdownDescription: ( localize(1786, "Controls if the AltGraph+ modifier should be treated as Ctrl+Alt+.")),
+            included: OS === OperatingSystem.Windows
         }
     }
 };
 configurationRegistry.registerConfiguration(keyboardConfiguration);
 
-export { readKeyboardConfig };
+export { DispatchConfig, readKeyboardConfig };

package/vscode/src/vs/platform/keyboardLayout/common/keyboardMapper.d.ts

@@ -0,0 +1,15 @@
+import { ResolvedKeybinding, Keybinding } from "vscode/vscode/vs/base/common/keybindings";
+import { IKeyboardEvent } from "vscode/vscode/vs/platform/keybinding/common/keybinding";
+export interface IKeyboardMapper {
+    dumpDebugInfo(): string;
+    resolveKeyboardEvent(keyboardEvent: IKeyboardEvent): ResolvedKeybinding;
+    resolveKeybinding(keybinding: Keybinding): ResolvedKeybinding[];
+}
+export declare class CachedKeyboardMapper implements IKeyboardMapper {
+    private _actual;
+    private _cache;
+    constructor(actual: IKeyboardMapper);
+    dumpDebugInfo(): string;
+    resolveKeyboardEvent(keyboardEvent: IKeyboardEvent): ResolvedKeybinding;
+    resolveKeybinding(keybinding: Keybinding): ResolvedKeybinding[];
+}

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

@@ -1,3 +1,5 @@
+
+
 class CachedKeyboardMapper {
     constructor(actual) {
         this._actual = actual;

package/vscode/src/vs/workbench/browser/contextkeys.d.ts

@@ -0,0 +1,67 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IContextKeyService } from "vscode/vscode/vs/platform/contextkey/common/contextkey.service";
+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 { IWorkspaceContextService } from "vscode/vscode/vs/platform/workspace/common/workspace.service";
+import { IWorkbenchLayoutService } from "vscode/vscode/vs/workbench/services/layout/browser/layoutService.service";
+import { IWorkingCopyService } from "vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service";
+import { IPaneCompositePartService } from "vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service";
+import { IProductService } from "vscode/vscode/vs/platform/product/common/productService.service";
+import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
+export declare class WorkbenchContextKeysHandler extends Disposable {
+    private readonly contextKeyService;
+    private readonly contextService;
+    private readonly configurationService;
+    private readonly environmentService;
+    private readonly productService;
+    private readonly editorGroupService;
+    private readonly editorService;
+    private readonly layoutService;
+    private readonly paneCompositeService;
+    private readonly workingCopyService;
+    private inputFocusedContext;
+    private dirtyWorkingCopiesContext;
+    private activeEditorGroupEmpty;
+    private activeEditorGroupIndex;
+    private activeEditorGroupLast;
+    private activeEditorGroupLocked;
+    private multipleEditorGroupsContext;
+    private editorsVisibleContext;
+    private splitEditorsVerticallyContext;
+    private workbenchStateContext;
+    private workspaceFolderCountContext;
+    private openFolderWorkspaceSupportContext;
+    private enterMultiRootWorkspaceSupportContext;
+    private emptyWorkspaceSupportContext;
+    private virtualWorkspaceContext;
+    private temporaryWorkspaceContext;
+    private inZenModeContext;
+    private isMainWindowFullscreenContext;
+    private isAuxiliaryWindowFocusedContext;
+    private isMainEditorCenteredLayoutContext;
+    private sideBarVisibleContext;
+    private mainEditorAreaVisibleContext;
+    private panelPositionContext;
+    private panelVisibleContext;
+    private panelAlignmentContext;
+    private panelMaximizedContext;
+    private auxiliaryBarVisibleContext;
+    private editorTabsVisibleContext;
+    private titleAreaVisibleContext;
+    private titleBarStyleContext;
+    constructor(contextKeyService: IContextKeyService, contextService: IWorkspaceContextService, configurationService: IConfigurationService, environmentService: IWorkbenchEnvironmentService, productService: IProductService, editorGroupService: IEditorGroupsService, editorService: IEditorService, layoutService: IWorkbenchLayoutService, paneCompositeService: IPaneCompositePartService, workingCopyService: IWorkingCopyService);
+    private registerListeners;
+    private updateVisiblePanesContextKeys;
+    private updateActiveEditorGroupContextKeys;
+    private updateEditorGroupsContextKeys;
+    private updateEditorAreaContextKeys;
+    private updateInputContextKeys;
+    private updateWorkbenchStateContextKey;
+    private updateWorkspaceFolderCountContextKey;
+    private updateSplitEditorsVerticallyContext;
+    private getWorkbenchStateString;
+    private updateSideBarContextKeys;
+    private updateTitleBarContextKeys;
+    private updateWorkspaceContextKeys;
+}

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

@@ -1,4 +1,5 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { setConstant } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -6,16 +7,16 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 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, isEditableElement, 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 { 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 '@codingame/monaco-vscode-e571cbbb-526b-5d8b-92c5-a0437d2dabb3-common/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 { getVirtualWorkspaceScheme } from '@codingame/monaco-vscode-d6e33d82-c101-549d-a885-0807ab3e0cfb-common/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 { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
@@ -90,13 +91,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("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() {
@@ -136,10 +137,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("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)));
@@ -203,20 +204,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() {

package/vscode/src/vs/workbench/contrib/commands/common/commands.contribution.d.ts

@@ -0,0 +1 @@
+export {};

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 { localize2, localize } from 'vscode/vscode/vs/nls';
 import { Action2, registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
@@ -9,10 +10,10 @@ class RunCommands extends Action2 {
     constructor() {
         super({
             id: 'runCommands',
-            title: ( localize2(3562, "Run Commands")),
+            title: ( localize2(4786, "Run Commands")),
             f1: false,
             metadata: {
-                description: ( localize(3563, "Run several commands")),
+                description: ( localize(4787, "Run several commands")),
                 args: [
                     {
                         name: 'args',
@@ -22,7 +23,7 @@ class RunCommands extends Action2 {
                             properties: {
                                 commands: {
                                     type: 'array',
-                                    description: ( localize(3564, "Commands to run")),
+                                    description: ( localize(4788, "Commands to run")),
                                     items: {
                                         anyOf: [
                                             {
@@ -62,14 +63,14 @@ class RunCommands extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!this._isCommandArgs(args)) {
             notificationService.error(( localize(
-                3565,
+                4789,
                 "'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(
-                3566,
+                4790,
                 "'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.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -1,3 +1,4 @@
+
 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';
@@ -9,7 +10,7 @@ class ToggleKeybindingsLogAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.toggleKeybindingsLog',
-            title: ( localize2(3558, "Toggle Keyboard Shortcuts Troubleshooting")),
+            title: ( localize2(6931, "Toggle Keyboard Shortcuts Troubleshooting")),
             category: Categories.Developer,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.d.ts

@@ -0,0 +1,14 @@
+import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
+import { IKeybindingService } from "vscode/vscode/vs/platform/keybinding/common/keybinding.service";
+import { ICodeEditor } from "vscode/vscode/vs/editor/browser/editorBrowser";
+export declare class KeybindingEditorDecorationsRenderer extends Disposable {
+    private _editor;
+    private readonly _keybindingService;
+    private _updateDecorations;
+    private readonly _dec;
+    constructor(_editor: ICodeEditor, _keybindingService: IKeybindingService);
+    private _updateDecorationsNow;
+    private _getDecorationForEntry;
+    static _userSettingsFuzzyEquals(a: string, b: string): boolean;
+    private _createDecoration;
+}