@codingame/monaco-vscode-keybindings-service-override 2.0.3 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-keybindings-service-override",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,8 +18,8 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.0.3",
+    "vscode": "npm:@codingame/monaco-vscode-api@2.1.0",
     "vscode-marked": "npm:marked@=3.0.2",
-    "@codingame/monaco-vscode-files-service-override": "2.0.3"
+    "@codingame/monaco-vscode-files-service-override": "2.1.0"
   }
 }

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

@@ -3,7 +3,7 @@ import { Event } from 'vscode/vscode/vs/base/common/event';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { setConstant, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 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, 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 { RemoteNameContext, VirtualWorkspaceContext, TemporaryWorkspaceContext, HasWebFileSystemAccess, EmbedderIdentifierContext, ActiveEditorContext, ActiveEditorReadonlyContext, ActiveCompareEditorOriginalWriteableContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorAvailableEditorIdsContext, EditorsVisibleContext, TextCompareEditorVisibleContext, TextCompareEditorActiveContext, SideBySideEditorActiveContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, DirtyWorkingCopiesContext, WorkbenchStateContext, WorkspaceFolderCountContext, OpenFolderWorkspaceSupportContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, SplitEditorsVertically, IsMainWindowFullscreenContext, 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 { onDidRegisterWindow, addDisposableListener, EventType, trackFocus, getActiveWindow } from 'vscode/vscode/vs/base/browser/dom';
 import { preferredSideBySideGroupDirection, IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
@@ -23,6 +23,8 @@ import { IProductService } from 'vscode/vscode/vs/platform/product/common/produc
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 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';
 
 let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disposable {
     constructor(contextKeyService, contextService, configurationService, environmentService, productService, editorService, editorResolverService, editorGroupService, layoutService, paneCompositeService, workingCopyService, fileService) {
@@ -58,6 +60,7 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
         EmbedderIdentifierContext.bindTo(this.contextKeyService).set(productService.embedderIdentifier);
         this.activeEditorContext = ActiveEditorContext.bindTo(this.contextKeyService);
         this.activeEditorIsReadonly = ActiveEditorReadonlyContext.bindTo(this.contextKeyService);
+        this.activeCompareEditorOriginalWritable = ActiveCompareEditorOriginalWriteableContext.bindTo(this.contextKeyService);
         this.activeEditorCanToggleReadonly = ActiveEditorCanToggleReadonlyContext.bindTo(this.contextKeyService);
         this.activeEditorCanRevert = ActiveEditorCanRevertContext.bindTo(this.contextKeyService);
         this.activeEditorCanSplitInGroup = ActiveEditorCanSplitInGroupContext.bindTo(this.contextKeyService);
@@ -86,7 +89,7 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
         this.enterMultiRootWorkspaceSupportContext.set(isNative || typeof this.environmentService.remoteAuthority === 'string');
         this.splitEditorsVerticallyContext = SplitEditorsVertically.bindTo(this.contextKeyService);
         this.updateSplitEditorsVerticallyContext();
-        this.isFullscreenContext = IsFullscreenContext.bindTo(this.contextKeyService);
+        this.isMainWindowFullscreenContext = IsMainWindowFullscreenContext.bindTo(this.contextKeyService);
         this.isAuxiliaryWindowFocusedContext = IsAuxiliaryWindowFocusedContext.bindTo(this.contextKeyService);
         this.inZenModeContext = InEditorZenModeContext.bindTo(this.contextKeyService);
         this.isCenteredLayoutContext = IsCenteredLayoutContext.bindTo(this.contextKeyService);
@@ -109,7 +112,7 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
         this.registerListeners();
     }
     registerListeners() {
-        this.editorGroupService.mainPart.whenReady.then(() => {
+        this.editorGroupService.whenReady.then(() => {
             this.updateEditorAreaContextKeys();
             this.updateEditorContextKeys();
         });
@@ -134,7 +137,11 @@ 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(onDidChangeFullscreen(windowId => {
+            if (windowId === mainWindow.vscodeWindowId) {
+                this.isMainWindowFullscreenContext.set(isFullscreen(mainWindow));
+            }
+        }));
         this._register(this.layoutService.onDidChangeCenteredLayout(centered => this.isCenteredLayoutContext.set(centered)));
         this._register(this.layoutService.onDidChangePanelPosition(position => this.panelPositionContext.set(position)));
         this._register(this.layoutService.onDidChangePanelAlignment(alignment => this.panelAlignmentContext.set(alignment)));
@@ -177,12 +184,14 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
             this.activeEditorCanSplitInGroup.set(activeEditorPane.input.hasCapability(32 ));
             applyAvailableEditorIds(this.activeEditorAvailableEditorIds, activeEditorPane.input, this.editorResolverService);
             this.activeEditorIsReadonly.set(!!activeEditorPane.input.isReadonly());
+            this.activeCompareEditorOriginalWritable.set(activeEditorPane.input instanceof DiffEditorInput && !activeEditorPane.input.original.isReadonly());
             const primaryEditorResource = EditorResourceAccessor.getOriginalUri(activeEditorPane.input, { supportSideBySide: SideBySideEditor.PRIMARY });
             this.activeEditorCanToggleReadonly.set(!!primaryEditorResource && this.fileService.hasProvider(primaryEditorResource) && !this.fileService.hasCapability(primaryEditorResource, 2048 ));
         }
         else {
             this.activeEditorContext.reset();
             this.activeEditorIsReadonly.reset();
+            this.activeCompareEditorOriginalWritable.reset();
             this.activeEditorCanToggleReadonly.reset();
             this.activeEditorCanRevert.reset();
             this.activeEditorCanSplitInGroup.reset();

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

@@ -225,6 +225,66 @@ const apiMenus = [
         )),
         proposed: 'contribSourceControlInputBoxMenu'
     },
+    {
+        key: 'scm/incomingChanges',
+        id: MenuId.SCMIncomingChanges,
+        description: ( localizeWithPath(
+            'vs/workbench/services/actions/common/menusExtensionPoint',
+            'menus.incomingChanges',
+            "The Source Control incoming changes menu"
+        )),
+        proposed: 'contribSourceControlHistoryItemGroupMenu'
+    },
+    {
+        key: 'scm/outgoingChanges',
+        id: MenuId.SCMOutgoingChanges,
+        description: ( localizeWithPath(
+            'vs/workbench/services/actions/common/menusExtensionPoint',
+            'menus.outgoingChanges',
+            "The Source Control outgoing changes menu"
+        )),
+        proposed: 'contribSourceControlHistoryItemGroupMenu'
+    },
+    {
+        key: 'scm/incomingChanges/allChanges/context',
+        id: MenuId.SCMIncomingChangesAllChangesContext,
+        description: ( localizeWithPath(
+            'vs/workbench/services/actions/common/menusExtensionPoint',
+            'menus.incomingChangesAllChangesContext',
+            "The Source Control all incoming changes context menu"
+        )),
+        proposed: 'contribSourceControlHistoryItemMenu'
+    },
+    {
+        key: 'scm/incomingChanges/historyItem/context',
+        id: MenuId.SCMIncomingChangesHistoryItemContext,
+        description: ( localizeWithPath(
+            'vs/workbench/services/actions/common/menusExtensionPoint',
+            'menus.incomingChangesHistoryItemContext',
+            "The Source Control incoming changes history item context menu"
+        )),
+        proposed: 'contribSourceControlHistoryItemMenu'
+    },
+    {
+        key: 'scm/outgoingChanges/allChanges/context',
+        id: MenuId.SCMOutgoingChangesAllChangesContext,
+        description: ( localizeWithPath(
+            'vs/workbench/services/actions/common/menusExtensionPoint',
+            'menus.outgoingChangesAllChangesContext',
+            "The Source Control all outgoing changes context menu"
+        )),
+        proposed: 'contribSourceControlHistoryItemMenu'
+    },
+    {
+        key: 'scm/outgoingChanges/historyItem/context',
+        id: MenuId.SCMOutgoingChangesHistoryItemContext,
+        description: ( localizeWithPath(
+            'vs/workbench/services/actions/common/menusExtensionPoint',
+            'menus.outgoingChangesHistoryItemContext',
+            "The Source Control outgoing changes history item context menu"
+        )),
+        proposed: 'contribSourceControlHistoryItemMenu'
+    },
     {
         key: 'statusBar/remoteIndicator',
         id: MenuId.StatusBarRemoteIndicatorMenu,
@@ -564,6 +624,16 @@ const apiMenus = [
         )),
         proposed: 'contribMergeEditorMenus'
     },
+    {
+        key: 'multiDiffEditor/resource/title',
+        id: MenuId.MultiDiffEditorFileToolbar,
+        description: ( localizeWithPath(
+            'vs/workbench/services/actions/common/menusExtensionPoint',
+            'menus.multiDiffEditorResource',
+            "The resource toolbar in the multi diff editor"
+        )),
+        proposed: 'contribMultiDiffEditorMenus'
+    }
 ];
 var schema;
 ( (function(schema) {

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

@@ -2,9 +2,9 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { onDidChangeFullscreen, isFullscreen } from 'vscode/vscode/vs/base/browser/browser';
 import { BrowserFeatures } from 'vscode/vscode/vs/base/browser/canIUse';
-import { onDidRegisterWindow, addDisposableListener, EventType } from 'vscode/vscode/vs/base/browser/dom';
+import { onDidRegisterWindow, addDisposableListener, EventType, trackFocus, getWindow } from 'vscode/vscode/vs/base/browser/dom';
 import { StandardKeyboardEvent, printKeyboardEvent, printStandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
-import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
+import { DeferredPromise, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { parse } from 'vscode/vscode/vs/base/common/json';
 import { UserSettingsLabelProvider } from 'vscode/vscode/vs/base/common/keybindingLabels';
@@ -227,6 +227,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
             this._keyboardMapper = this.keyboardLayoutService.getKeyboardMapper();
             this.updateResolver();
         });
+        this._keybindingHoldMode = null;
         this._cachedResolver = null;
         this.userKeybindings = this._register(( new UserKeybindings(userDataProfileService, uriIdentityService, fileService, logService)));
         this.userKeybindings.initialize().then(() => {
@@ -249,12 +250,15 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         this.updateKeybindingsJsonSchema();
         this._register(extensionService.onDidRegisterExtensions(() => this.updateKeybindingsJsonSchema()));
         this._register(Event.runAndSubscribe(onDidRegisterWindow, ({ window, disposables }) => disposables.add(this._registerKeyListeners(window)), { window: mainWindow, disposables: this._store }));
-        this._register(onDidChangeFullscreen(() => {
+        this._register(onDidChangeFullscreen(windowId => {
+            if (windowId !== mainWindow.vscodeWindowId) {
+                return;
+            }
             const keyboard = navigator.keyboard;
             if (BrowserFeatures.keyboard === 2 ) {
                 return;
             }
-            if (isFullscreen()) {
+            if (isFullscreen(mainWindow)) {
                 keyboard?.lock(['Escape']);
             }
             else {
@@ -267,6 +271,9 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
     _registerKeyListeners(window) {
         const disposables = ( new DisposableStore());
         disposables.add(addDisposableListener(window, EventType.KEY_DOWN, (e) => {
+            if (this._keybindingHoldMode) {
+                return;
+            }
             this.isComposingGlobalContextKey.set(e.isComposing);
             const keyEvent = ( new StandardKeyboardEvent(e));
             this._log(`/ Received  keydown event - ${printKeyboardEvent(e)}`);
@@ -278,6 +285,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
             this.isComposingGlobalContextKey.set(false);
         }));
         disposables.add(addDisposableListener(window, EventType.KEY_UP, (e) => {
+            this._resetKeybindingHoldMode();
             this.isComposingGlobalContextKey.set(e.isComposing);
             const keyEvent = ( new StandardKeyboardEvent(e));
             const shouldPreventDefault = this._singleModifierDispatch(keyEvent, keyEvent.target);
@@ -367,6 +375,26 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         };
         return JSON.stringify(info, null, '\t');
     }
+    enableKeybindingHoldMode(commandId) {
+        if (this._currentlyDispatchingCommandId !== commandId) {
+            return undefined;
+        }
+        this._keybindingHoldMode = ( new DeferredPromise());
+        const focusTracker = trackFocus(getWindow(undefined));
+        const listener = focusTracker.onDidBlur(() => this._resetKeybindingHoldMode());
+        this._keybindingHoldMode.p.finally(() => {
+            listener.dispose();
+            focusTracker.dispose();
+        });
+        this._log(`+ Enabled hold-mode for ${commandId}.`);
+        return this._keybindingHoldMode.p;
+    }
+    _resetKeybindingHoldMode() {
+        if (this._keybindingHoldMode) {
+            this._keybindingHoldMode?.complete();
+            this._keybindingHoldMode = null;
+        }
+    }
     customKeybindingsCount() {
         return this.userKeybindings.keybindings.length;
     }
@@ -455,7 +483,7 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         if (BrowserFeatures.keyboard === 0 ) {
             return false;
         }
-        if (BrowserFeatures.keyboard === 1  && isFullscreen()) {
+        if (BrowserFeatures.keyboard === 1  && isFullscreen(mainWindow)) {
             return false;
         }
         for (const chord of keybinding.chords) {