@codingame/monaco-vscode-keybindings-service-override 3.2.2 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-keybindings-service-override",
-  "version": "3.2.2",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,13 +18,13 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.2",
-    "@codingame/monaco-vscode-files-service-override": "3.2.2",
-    "@codingame/monaco-vscode-quickaccess-service-override": "3.2.2",
-    "@codingame/monaco-vscode-extensions-service-override": "3.2.2",
-    "@codingame/monaco-vscode-environment-service-override": "3.2.2",
-    "@codingame/monaco-vscode-layout-service-override": "3.2.2",
-    "@codingame/monaco-vscode-host-service-override": "3.2.2",
-    "@codingame/monaco-vscode-base-service-override": "3.2.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0",
+    "@codingame/monaco-vscode-files-service-override": "4.0.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "4.0.0",
+    "@codingame/monaco-vscode-extensions-service-override": "4.0.0",
+    "@codingame/monaco-vscode-environment-service-override": "4.0.0",
+    "@codingame/monaco-vscode-layout-service-override": "4.0.0",
+    "@codingame/monaco-vscode-host-service-override": "4.0.0",
+    "@codingame/monaco-vscode-base-service-override": "4.0.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, ActiveCompareEditorOriginalWriteableContext, 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 { 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 { onDidRegisterWindow, addDisposableListener, EventType, trackFocus, getActiveWindow } from 'vscode/vscode/vs/base/browser/dom';
 import { preferredSideBySideGroupDirection, IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
@@ -25,6 +25,7 @@ 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';
 
 let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disposable {
     constructor(contextKeyService, contextService, configurationService, environmentService, productService, editorService, editorResolverService, editorGroupService, layoutService, paneCompositeService, workingCopyService, fileService) {
@@ -60,7 +61,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.activeCompareEditorCanSwap = ActiveCompareEditorCanSwapContext.bindTo(this.contextKeyService);
         this.activeEditorCanToggleReadonly = ActiveEditorCanToggleReadonlyContext.bindTo(this.contextKeyService);
         this.activeEditorCanRevert = ActiveEditorCanRevertContext.bindTo(this.contextKeyService);
         this.activeEditorCanSplitInGroup = ActiveEditorCanSplitInGroupContext.bindTo(this.contextKeyService);
@@ -184,14 +185,15 @@ 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 });
+            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.activeCompareEditorOriginalWritable.reset();
+            this.activeCompareEditorCanSwap.reset();
             this.activeEditorCanToggleReadonly.reset();
             this.activeEditorCanRevert.reset();
             this.activeEditorCanSplitInGroup.reset();

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

@@ -456,6 +456,16 @@ const apiMenus = [
         )),
         proposed: 'contribCommentPeekContext'
     },
+    {
+        key: 'commentsView/commentThread/context',
+        id: MenuId.CommentsViewThreadActions,
+        description: ( localizeWithPath(
+            'vs/workbench/services/actions/common/menusExtensionPoint',
+            'commentsView.threadActions',
+            "The contributed comment thread context menu in the comments view"
+        )),
+        proposed: 'contribCommentsViewThreadMenus'
+    },
     {
         key: 'notebook/toolbar',
         id: MenuId.NotebookToolbar,
@@ -539,6 +549,15 @@ const apiMenus = [
             "The menu for a gutter decoration for a test item"
         )),
     },
+    {
+        key: 'testing/item/result',
+        id: MenuId.TestPeekElement,
+        description: ( localizeWithPath(
+            'vs/workbench/services/actions/common/menusExtensionPoint',
+            'testing.item.result.title',
+            "The menu for an item in the Test Results view or peek."
+        )),
+    },
     {
         key: 'testing/message/context',
         id: MenuId.TestMessageContext,
@@ -700,6 +719,26 @@ const apiMenus = [
             "The resource toolbar in the multi diff editor"
         )),
         proposed: 'contribMultiDiffEditorMenus'
+    },
+    {
+        key: 'diffEditor/gutter/hunk',
+        id: MenuId.DiffEditorHunkToolbar,
+        description: ( localizeWithPath(
+            'vs/workbench/services/actions/common/menusExtensionPoint',
+            'menus.diffEditorGutterToolBarMenus',
+            "The gutter toolbar in the diff editor"
+        )),
+        proposed: 'contribDiffEditorGutterToolBarMenus'
+    },
+    {
+        key: 'diffEditor/gutter/selection',
+        id: MenuId.DiffEditorSelectionToolbar,
+        description: ( localizeWithPath(
+            'vs/workbench/services/actions/common/menusExtensionPoint',
+            'menus.diffEditorGutterToolBarMenus',
+            "The gutter toolbar in the diff editor"
+        )),
+        proposed: 'contribDiffEditorGutterToolBarMenus'
     }
 ];
 var schema;

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

@@ -22,6 +22,7 @@ import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/co
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
 import { Extensions } from 'vscode/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { AbstractKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/abstractKeybindingService';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { KeybindingResolver } from 'vscode/vscode/vs/platform/keybinding/common/keybindingResolver';
 import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ResolvedKeybindingItem } from 'vscode/vscode/vs/platform/keybinding/common/resolvedKeybindingItem';
@@ -223,10 +224,10 @@ let WorkbenchKeybindingService = WorkbenchKeybindingService_1 = class WorkbenchK
         this.kbsJsonSchema = ( new KeybindingsJsonSchema());
         this.updateKeybindingsJsonSchema();
         this._keyboardMapper = this.keyboardLayoutService.getKeyboardMapper();
-        this.keyboardLayoutService.onDidChangeKeyboardLayout(() => {
+        this._register(this.keyboardLayoutService.onDidChangeKeyboardLayout(() => {
             this._keyboardMapper = this.keyboardLayoutService.getKeyboardMapper();
             this.updateResolver();
-        });
+        }));
         this._keybindingHoldMode = null;
         this._cachedResolver = null;
         this.userKeybindings = this._register(( new UserKeybindings(userDataProfileService, uriIdentityService, fileService, logService)));