@codingame/monaco-vscode-keybindings-service-override 1.83.16 → 1.85.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-keybindings-service-override",
-  "version": "1.83.16",
+  "version": "1.85.0-next.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.83.16",
-    "monaco-editor": "0.44.0",
-    "@codingame/monaco-vscode-files-service-override": "1.83.16"
+    "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.0",
+    "monaco-editor": "0.45.0",
+    "@codingame/monaco-vscode-files-service-override": "1.85.0-next.0"
   }
 }

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

@@ -3,9 +3,9 @@ import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { setConstant, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { IsMacContext, IsLinuxContext, IsWindowsContext, IsWebContext, IsMacNativeContext, IsIOSContext, IsMobileContext, IsDevelopmentContext, ProductQualityContext, InputFocusedContext } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
-import { RemoteNameContext, VirtualWorkspaceContext, TemporaryWorkspaceContext, HasWebFileSystemAccess, EmbedderIdentifierContext, ActiveEditorContext, ActiveEditorReadonlyContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorAvailableEditorIdsContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, SideBySideEditorActiveContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, DirtyWorkingCopiesContext, WorkbenchStateContext, WorkspaceFolderCountContext, OpenFolderWorkspaceSupportContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, SplitEditorsVertically, IsFullscreenContext, InEditorZenModeContext, IsCenteredLayoutContext, EditorAreaVisibleContext, EditorTabsVisibleContext, SideBarVisibleContext, PanelPositionContext, PanelVisibleContext, PanelMaximizedContext, PanelAlignmentContext, AuxiliaryBarVisibleContext, applyAvailableEditorIds } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { RemoteNameContext, VirtualWorkspaceContext, TemporaryWorkspaceContext, HasWebFileSystemAccess, EmbedderIdentifierContext, ActiveEditorContext, ActiveEditorReadonlyContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorAvailableEditorIdsContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, SideBySideEditorActiveContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, DirtyWorkingCopiesContext, WorkbenchStateContext, WorkspaceFolderCountContext, OpenFolderWorkspaceSupportContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, SplitEditorsVertically, IsFullscreenContext, IsAuxiliaryWindowFocusedContext, InEditorZenModeContext, IsCenteredLayoutContext, 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 { addDisposableListener, EventType, trackFocus } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { onDidRegisterWindow, addDisposableListener, EventType, trackFocus, getActiveWindow } from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { preferredSideBySideGroupDirection, IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
@@ -21,6 +21,8 @@ import { IPaneCompositePartService } from 'vscode/vscode/vs/workbench/services/p
 import { WebFileSystemAccess } from 'monaco-editor/esm/vs/platform/files/browser/webFileSystemAccess.js';
 import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
 import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+import { getTitleBarStyle } from 'vscode/vscode/vs/platform/window/common/window';
+import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
 
 let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disposable {
     constructor(contextKeyService, contextService, configurationService, environmentService, productService, editorService, editorResolverService, editorGroupService, layoutService, paneCompositeService, workingCopyService, fileService) {
@@ -48,7 +50,7 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
         this.virtualWorkspaceContext = VirtualWorkspaceContext.bindTo(this.contextKeyService);
         this.temporaryWorkspaceContext = TemporaryWorkspaceContext.bindTo(this.contextKeyService);
         this.updateWorkspaceContextKeys();
-        HasWebFileSystemAccess.bindTo(this.contextKeyService).set(WebFileSystemAccess.supported(window));
+        HasWebFileSystemAccess.bindTo(this.contextKeyService).set(WebFileSystemAccess.supported(mainWindow));
         const isDevelopment = !this.environmentService.isBuilt || this.environmentService.isExtensionDevelopment;
         IsDevelopmentContext.bindTo(this.contextKeyService).set(isDevelopment);
         setConstant(IsDevelopmentContext.key, isDevelopment);
@@ -85,11 +87,15 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
         this.splitEditorsVerticallyContext = SplitEditorsVertically.bindTo(this.contextKeyService);
         this.updateSplitEditorsVerticallyContext();
         this.isFullscreenContext = IsFullscreenContext.bindTo(this.contextKeyService);
+        this.isAuxiliaryWindowFocusedContext = IsAuxiliaryWindowFocusedContext.bindTo(this.contextKeyService);
         this.inZenModeContext = InEditorZenModeContext.bindTo(this.contextKeyService);
         this.isCenteredLayoutContext = IsCenteredLayoutContext.bindTo(this.contextKeyService);
-        this.editorAreaVisibleContext = EditorAreaVisibleContext.bindTo(this.contextKeyService);
+        this.mainEditorAreaVisibleContext = MainEditorAreaVisibleContext.bindTo(this.contextKeyService);
         this.editorTabsVisibleContext = EditorTabsVisibleContext.bindTo(this.contextKeyService);
         this.sideBarVisibleContext = SideBarVisibleContext.bindTo(this.contextKeyService);
+        this.titleAreaVisibleContext = TitleBarVisibleContext.bindTo(this.contextKeyService);
+        this.titleBarStyleContext = TitleBarStyleContext.bindTo(this.contextKeyService);
+        this.updateTitleBarContextKeys();
         this.panelPositionContext = PanelPositionContext.bindTo(this.contextKeyService);
         this.panelPositionContext.set(positionToString(this.layoutService.getPanelPosition()));
         this.panelVisibleContext = PanelVisibleContext.bindTo(this.contextKeyService);
@@ -103,7 +109,7 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
         this.registerListeners();
     }
     registerListeners() {
-        this.editorGroupService.whenReady.then(() => {
+        this.editorGroupService.mainPart.whenReady.then(() => {
             this.updateEditorAreaContextKeys();
             this.updateEditorContextKeys();
         });
@@ -115,7 +121,7 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
         this._register(this.editorGroupService.onDidChangeActiveGroup(() => this.updateEditorGroupContextKeys()));
         this._register(this.editorGroupService.onDidChangeGroupLocked(() => this.updateEditorGroupContextKeys()));
         this._register(this.editorGroupService.onDidChangeEditorPartOptions(() => this.updateEditorAreaContextKeys()));
-        this._register(addDisposableListener(window, EventType.FOCUS_IN, () => this.updateInputContextKeys(), true));
+        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()));
         this._register(this.contextService.onDidChangeWorkspaceFolders(() => {
             this.updateWorkspaceFolderCountContextKey();
@@ -127,6 +133,7 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
             }
         }));
         this._register(this.layoutService.onDidChangeZenMode(enabled => this.inZenModeContext.set(enabled)));
+        this._register(this.layoutService.onDidChangeActiveContainer(() => this.isAuxiliaryWindowFocusedContext.set(this.layoutService.activeContainer !== this.layoutService.mainContainer)));
         this._register(this.layoutService.onDidChangeFullscreen(fullscreen => this.isFullscreenContext.set(fullscreen)));
         this._register(this.layoutService.onDidChangeCenteredLayout(centered => this.isCenteredLayoutContext.set(centered)));
         this._register(this.layoutService.onDidChangePanelPosition(position => this.panelPositionContext.set(position)));
@@ -134,15 +141,16 @@ 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.editorAreaVisibleContext.set(this.layoutService.isVisible("workbench.parts.editor" ));
+            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("workbench.parts.auxiliarybar" ));
+            this.updateTitleBarContextKeys();
         }));
         this._register(this.workingCopyService.onDidChangeDirty(workingCopy => this.dirtyWorkingCopiesContext.set(workingCopy.isDirty() || this.workingCopyService.hasDirty)));
     }
     updateEditorAreaContextKeys() {
-        this.editorTabsVisibleContext.set(!!this.editorGroupService.partOptions.showTabs);
+        this.editorTabsVisibleContext.set(this.editorGroupService.partOptions.showTabs === 'multiple');
     }
     updateEditorContextKeys() {
         const activeEditorPane = this.editorService.activeEditorPane;
@@ -194,16 +202,18 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
         this.activeEditorGroupLast.set(activeGroup.index === groupCount - 1);
         this.activeEditorGroupLocked.set(activeGroup.isLocked);
     }
-    updateInputContextKeys() {
+    updateInputContextKeys(ownerDocument) {
         function activeElementIsInput() {
-            return !!document.activeElement && (document.activeElement.tagName === 'INPUT' || document.activeElement.tagName === 'TEXTAREA');
+            return !!ownerDocument.activeElement && (ownerDocument.activeElement.tagName === 'INPUT' || ownerDocument.activeElement.tagName === 'TEXTAREA');
         }
         const isInputFocused = activeElementIsInput();
         this.inputFocusedContext.set(isInputFocused);
         if (isInputFocused) {
-            const tracker = trackFocus(document.activeElement);
+            const tracker = trackFocus(ownerDocument.activeElement);
             Event.once(tracker.onDidBlur)(() => {
-                this.inputFocusedContext.set(activeElementIsInput());
+                if (getActiveWindow().document === ownerDocument) {
+                    this.inputFocusedContext.set(activeElementIsInput());
+                }
                 tracker.dispose();
             });
         }
@@ -228,6 +238,10 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
     updateSideBarContextKeys() {
         this.sideBarVisibleContext.set(this.layoutService.isVisible("workbench.parts.sidebar" ));
     }
+    updateTitleBarContextKeys() {
+        this.titleAreaVisibleContext.set(this.layoutService.isVisible("workbench.parts.titlebar" , mainWindow));
+        this.titleBarStyleContext.set(getTitleBarStyle(this.configurationService));
+    }
     updateWorkspaceContextKeys() {
         this.virtualWorkspaceContext.set(getVirtualWorkspaceScheme(this.contextService.getWorkspace()) || '');
         this.temporaryWorkspaceContext.set(isTemporaryWorkspace(this.contextService.getWorkspace()));

package/vscode/src/vs/workbench/services/actions/common/menusExtensionPoint.js

@@ -215,6 +215,16 @@ const apiMenus = [
             "The Source Control inline change menu"
         ))
     },
+    {
+        key: 'scm/inputBox',
+        id: MenuId.SCMInputBox,
+        description: ( localizeWithPath(
+            'vs/workbench/services/actions/common/menusExtensionPoint',
+            'menus.input',
+            "The Source Control input box menu"
+        )),
+        proposed: 'contribSourceControlInputBoxMenu'
+    },
     {
         key: 'statusBar/remoteIndicator',
         id: MenuId.StatusBarRemoteIndicatorMenu,

package/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.js

@@ -5,7 +5,7 @@ import { BrowserFeatures } from 'monaco-editor/esm/vs/base/browser/canIUse.js';
 import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
 import { StandardKeyboardEvent, printKeyboardEvent, printStandardKeyboardEvent } from 'monaco-editor/esm/vs/base/browser/keyboardEvent.js';
 import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
-import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
+import { Event, Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { parse } from 'monaco-editor/esm/vs/base/common/json.js';
 import { UserSettingsLabelProvider } from 'monaco-editor/esm/vs/base/common/keybindingLabels.js';
 import { KeybindingParser } from '../../../../base/common/keybindingParser.js';
@@ -15,6 +15,7 @@ import { DisposableStore, Disposable } from 'monaco-editor/esm/vs/base/common/li
 import * as objects from 'monaco-editor/esm/vs/base/common/objects.js';
 import { OS, isMacintosh } from 'monaco-editor/esm/vs/base/common/platform.js';
 import { dirname } from 'monaco-editor/esm/vs/base/common/resources.js';
+import { mainWindow } from 'monaco-editor/esm/vs/base/browser/window.js';
 import { MenuRegistry } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { CommandsRegistry, ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
 import { ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
@@ -29,6 +30,8 @@ import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
 import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
 import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
+import { isLocalizedString } from 'monaco-editor/esm/vs/platform/action/common/action.js';
 import { commandsExtensionPoint } from '../../actions/common/menusExtensionPoint.js';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { ExtensionsRegistry } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
@@ -36,7 +39,6 @@ import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/h
 import { getAllUnboundCommands } from 'vscode/vscode/vs/workbench/services/keybinding/browser/unboundCommands';
 import { KeybindingIO, OutputBuilder } from '../common/keybindingIO.js';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
 
 var WorkbenchKeybindingService_1;
 function isValidContributedKeyBinding(keyBinding, rejects) {
@@ -246,10 +248,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         });
         this.updateKeybindingsJsonSchema();
         this._register(extensionService.onDidRegisterExtensions(() => this.updateKeybindingsJsonSchema()));
-        this._register(this._registerKeyListeners(window));
-        this._register(dom.onDidCreateWindow(({ window, disposableStore }) => {
-            disposableStore.add(this._registerKeyListeners(window));
-        }));
+        this._register(Event.runAndSubscribe(dom.onDidRegisterWindow, ({ window, disposables }) => disposables.add(this._registerKeyListeners(window)), { window: mainWindow, disposables: this._store }));
         this._register(browser.onDidChangeFullscreen(() => {
             const keyboard = navigator.keyboard;
             if (BrowserFeatures.keyboard === 2 ) {
@@ -875,21 +874,21 @@ class KeybindingsJsonSchema {
                 if (!( knownCommands.has(commandId))) {
                     knownCommands.add(commandId);
                     this.commandsEnum.push(commandId);
-                    this.commandsEnumDescriptions.push(description);
+                    this.commandsEnumDescriptions.push(isLocalizedString(description) ? description.value : description);
                     this.removalCommandsEnum.push(`-${commandId}`);
                 }
             }
         };
         const allCommands = CommandsRegistry.getCommands();
         for (const [commandId, command] of allCommands) {
-            const commandDescription = command.description;
-            addKnownCommand(commandId, commandDescription ? commandDescription.description : undefined);
-            if (!commandDescription || !commandDescription.args || commandDescription.args.length !== 1 || !commandDescription.args[0].schema) {
+            const commandMetadata = command.metadata;
+            addKnownCommand(commandId, commandMetadata?.description);
+            if (!commandMetadata || !commandMetadata.args || commandMetadata.args.length !== 1 || !commandMetadata.args[0].schema) {
                 continue;
             }
-            const argsSchema = commandDescription.args[0].schema;
-            const argsRequired = ((typeof commandDescription.args[0].isOptional !== 'undefined')
-                ? (!commandDescription.args[0].isOptional)
+            const argsSchema = commandMetadata.args[0].schema;
+            const argsRequired = ((typeof commandMetadata.args[0].isOptional !== 'undefined')
+                ? (!commandMetadata.args[0].isOptional)
                 : (Array.isArray(argsSchema.required) && argsSchema.required.length > 0));
             const addition = {
                 'if': {