@codingame/monaco-vscode-api 5.3.0 → 6.0.0

package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsControl.js

@@ -4,6 +4,7 @@ import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { BreadcrumbsWidget, BreadcrumbsItem } from '../../../../base/browser/ui/breadcrumbs/breadcrumbsWidget.js';
 import { tail } from '../../../../base/common/arrays.js';
 import { timeout } from '../../../../base/common/async.js';
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { DisposableStore, MutableDisposable, toDisposable, combinedDisposable } from '../../../../base/common/lifecycle.js';
 import { extUri } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
@@ -17,7 +18,7 @@ import { IContextViewService } from '../../../../platform/contextview/browser/co
 import { FileKind } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { WorkbenchListFocusContextKey, WorkbenchDataTree, WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
 import { IListService } from '../../../../platform/list/browser/listService.service.js';
 import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
@@ -534,8 +535,8 @@ registerAction2(class FocusAndSelectBreadcrumbs extends Action2 {
             title: ( localize2WithPath(_moduleId, 9, "Focus and Select Breadcrumbs")),
             precondition: BreadcrumbsControl.CK_BreadcrumbsVisible,
             keybinding: {
-                weight: 200 ,
-                primary: 2048  | 1024  | 89 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.Period,
                 when: BreadcrumbsControl.CK_BreadcrumbsPossible,
             },
             f1: true
@@ -552,8 +553,8 @@ registerAction2(class FocusBreadcrumbs extends Action2 {
             title: ( localize2WithPath(_moduleId, 10, "Focus Breadcrumbs")),
             precondition: BreadcrumbsControl.CK_BreadcrumbsVisible,
             keybinding: {
-                weight: 200 ,
-                primary: 2048  | 1024  | 85 ,
+                weight: KeybindingWeight.WorkbenchContrib,
+                primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.Semicolon,
                 when: BreadcrumbsControl.CK_BreadcrumbsPossible,
             },
             f1: true
@@ -565,8 +566,8 @@ registerAction2(class FocusBreadcrumbs extends Action2 {
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'breadcrumbs.toggleToOn',
-    weight: 200 ,
-    primary: 2048  | 1024  | 89 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyMod$1.CtrlCmd | KeyMod$1.Shift | KeyCode.Period,
     when: ContextKeyExpr.not('config.breadcrumbs.enabled'),
     handler: async (accessor) => {
         const instant = accessor.get(IInstantiationService);
@@ -581,12 +582,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'breadcrumbs.focusNext',
-    weight: 200 ,
-    primary: 17 ,
-    secondary: [2048  | 17 ],
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyCode.RightArrow,
+    secondary: [KeyMod$1.CtrlCmd | KeyCode.RightArrow],
     mac: {
-        primary: 17 ,
-        secondary: [512  | 17 ],
+        primary: KeyCode.RightArrow,
+        secondary: [KeyMod$1.Alt | KeyCode.RightArrow],
     },
     when: ( (ContextKeyExpr.and(
         BreadcrumbsControl.CK_BreadcrumbsVisible,
@@ -604,12 +605,12 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'breadcrumbs.focusPrevious',
-    weight: 200 ,
-    primary: 15 ,
-    secondary: [2048  | 15 ],
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyCode.LeftArrow,
+    secondary: [KeyMod$1.CtrlCmd | KeyCode.LeftArrow],
     mac: {
-        primary: 15 ,
-        secondary: [512  | 15 ],
+        primary: KeyCode.LeftArrow,
+        secondary: [KeyMod$1.Alt | KeyCode.LeftArrow],
     },
     when: ( (ContextKeyExpr.and(
         BreadcrumbsControl.CK_BreadcrumbsVisible,
@@ -627,10 +628,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'breadcrumbs.focusNextWithPicker',
-    weight: 200  + 1,
-    primary: 2048  | 17 ,
+    weight: KeybindingWeight.WorkbenchContrib + 1,
+    primary: KeyMod$1.CtrlCmd | KeyCode.RightArrow,
     mac: {
-        primary: 512  | 17 ,
+        primary: KeyMod$1.Alt | KeyCode.RightArrow,
     },
     when: ( (ContextKeyExpr.and(
         BreadcrumbsControl.CK_BreadcrumbsVisible,
@@ -649,10 +650,10 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'breadcrumbs.focusPreviousWithPicker',
-    weight: 200  + 1,
-    primary: 2048  | 15 ,
+    weight: KeybindingWeight.WorkbenchContrib + 1,
+    primary: KeyMod$1.CtrlCmd | KeyCode.LeftArrow,
     mac: {
-        primary: 512  | 15 ,
+        primary: KeyMod$1.Alt | KeyCode.LeftArrow,
     },
     when: ( (ContextKeyExpr.and(
         BreadcrumbsControl.CK_BreadcrumbsVisible,
@@ -671,9 +672,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'breadcrumbs.selectFocused',
-    weight: 200 ,
-    primary: 3 ,
-    secondary: [18 ],
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyCode.Enter,
+    secondary: [KeyCode.DownArrow],
     when: ( (ContextKeyExpr.and(
         BreadcrumbsControl.CK_BreadcrumbsVisible,
         BreadcrumbsControl.CK_BreadcrumbsActive
@@ -690,9 +691,9 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'breadcrumbs.revealFocused',
-    weight: 200 ,
-    primary: 10 ,
-    secondary: [2048  | 3 ],
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyCode.Space,
+    secondary: [KeyMod$1.CtrlCmd | KeyCode.Enter],
     when: ( (ContextKeyExpr.and(
         BreadcrumbsControl.CK_BreadcrumbsVisible,
         BreadcrumbsControl.CK_BreadcrumbsActive
@@ -709,8 +710,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'breadcrumbs.selectEditor',
-    weight: 200  + 1,
-    primary: 9 ,
+    weight: KeybindingWeight.WorkbenchContrib + 1,
+    primary: KeyCode.Escape,
     when: ( (ContextKeyExpr.and(
         BreadcrumbsControl.CK_BreadcrumbsVisible,
         BreadcrumbsControl.CK_BreadcrumbsActive
@@ -729,8 +730,8 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'breadcrumbs.revealFocusedFromTreeAside',
-    weight: 200 ,
-    primary: 2048  | 3 ,
+    weight: KeybindingWeight.WorkbenchContrib,
+    primary: KeyMod$1.CtrlCmd | KeyCode.Enter,
     when: ( (ContextKeyExpr.and(
         BreadcrumbsControl.CK_BreadcrumbsVisible,
         BreadcrumbsControl.CK_BreadcrumbsActive,

package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsModel.js

@@ -7,8 +7,10 @@ import { matchesSomeScheme, Schemas } from '../../../../base/common/network.js';
 import { isEqual, dirname } from '../../../../base/common/resources.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { FileKind } from '../../../../platform/files/common/files.js';
+import { WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { BreadcrumbsConfig } from './breadcrumbs.js';
+import { OutlineTarget } from '../../../services/outline/browser/outline.js';
 import { IOutlineService } from '../../../services/outline/browser/outline.service.js';
 class FileElement {
     constructor(uri, kind) {
@@ -102,7 +104,7 @@ let BreadcrumbsModel = class BreadcrumbsModel {
                 break;
             }
         }
-        if (info.folder && this._workspaceService.getWorkbenchState() === 3 ) {
+        if (info.folder && this._workspaceService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
             info.path.unshift(( new FileElement(info.folder.uri, FileKind.ROOT_FOLDER)));
         }
         return info;
@@ -116,7 +118,7 @@ let BreadcrumbsModel = class BreadcrumbsModel {
         this._currentOutline.clear();
         this._outlineDisposables.clear();
         this._outlineDisposables.add(toDisposable(() => newCts.dispose(true)));
-        this._outlineService.createOutline(editor, 2 , newCts.token).then(outline => {
+        this._outlineService.createOutline(editor, OutlineTarget.Breadcrumbs, newCts.token).then(outline => {
             if (newCts.token.isCancellationRequested) {
                 outline?.dispose();
                 outline = undefined;

package/vscode/src/vs/workbench/browser/parts/editor/diffEditorCommands.js

@@ -1,8 +1,11 @@
+import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
+import { isEqual } from '../../../../base/common/resources.js';
+import { URI } from '../../../../base/common/uri.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
 import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
-import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { TextDiffEditor } from './textDiffEditor.js';
 import { TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveCompareEditorCanSwapContext } from '../../../common/contextkeys.js';
 import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
@@ -20,10 +23,10 @@ const DIFF_SWAP_SIDES = 'workbench.action.compareEditor.swapSides';
 function registerDiffEditorCommands() {
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: GOTO_NEXT_CHANGE,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: TextCompareEditorVisibleContext,
-        primary: 512  | 63 ,
-        handler: accessor => navigateInDiffEditor(accessor, true)
+        primary: KeyMod$1.Alt | KeyCode.F5,
+        handler: (accessor, ...args) => navigateInDiffEditor(accessor, args, true)
     });
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
@@ -33,10 +36,10 @@ function registerDiffEditorCommands() {
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: GOTO_PREVIOUS_CHANGE,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: TextCompareEditorVisibleContext,
-        primary: 512  | 1024  | 63 ,
-        handler: accessor => navigateInDiffEditor(accessor, false)
+        primary: KeyMod$1.Alt | KeyMod$1.Shift | KeyCode.F5,
+        handler: (accessor, ...args) => navigateInDiffEditor(accessor, args, false)
     });
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {
@@ -44,17 +47,18 @@ function registerDiffEditorCommands() {
             title: ( localize2WithPath(_moduleId, 1, 'Go to Previous Change')),
         }
     });
-    function getActiveTextDiffEditor(accessor) {
+    function getActiveTextDiffEditor(accessor, args) {
         const editorService = accessor.get(IEditorService);
+        const resource = args.length > 0 && args[0] instanceof URI ? args[0] : undefined;
         for (const editor of [editorService.activeEditorPane, ...editorService.visibleEditorPanes]) {
-            if (editor instanceof TextDiffEditor) {
+            if (editor instanceof TextDiffEditor && (!resource || editor.input instanceof DiffEditorInput && isEqual(editor.input.primary.resource, resource))) {
                 return editor;
             }
         }
         return undefined;
     }
-    function navigateInDiffEditor(accessor, next) {
-        const activeTextDiffEditor = getActiveTextDiffEditor(accessor);
+    function navigateInDiffEditor(accessor, args, next) {
+        const activeTextDiffEditor = getActiveTextDiffEditor(accessor, args);
         if (activeTextDiffEditor) {
             activeTextDiffEditor.getControl()?.goToDiff(next ? 'next' : 'previous');
         }
@@ -65,8 +69,8 @@ function registerDiffEditorCommands() {
         FocusTextDiffEditorMode[FocusTextDiffEditorMode["Modified"] = 1] = "Modified";
         FocusTextDiffEditorMode[FocusTextDiffEditorMode["Toggle"] = 2] = "Toggle";
     })(FocusTextDiffEditorMode || (FocusTextDiffEditorMode = {}))));
-    function focusInDiffEditor(accessor, mode) {
-        const activeTextDiffEditor = getActiveTextDiffEditor(accessor);
+    function focusInDiffEditor(accessor, args, mode) {
+        const activeTextDiffEditor = getActiveTextDiffEditor(accessor, args);
         if (activeTextDiffEditor) {
             switch (mode) {
                 case FocusTextDiffEditorMode.Original:
@@ -77,17 +81,17 @@ function registerDiffEditorCommands() {
                     break;
                 case FocusTextDiffEditorMode.Toggle:
                     if (activeTextDiffEditor.getControl()?.getModifiedEditor().hasWidgetFocus()) {
-                        return focusInDiffEditor(accessor, FocusTextDiffEditorMode.Original);
+                        return focusInDiffEditor(accessor, args, FocusTextDiffEditorMode.Original);
                     }
                     else {
-                        return focusInDiffEditor(accessor, FocusTextDiffEditorMode.Modified);
+                        return focusInDiffEditor(accessor, args, FocusTextDiffEditorMode.Modified);
                     }
             }
         }
     }
-    function toggleDiffSideBySide(accessor) {
+    function toggleDiffSideBySide(accessor, args) {
         const configService = accessor.get(ITextResourceConfigurationService);
-        const activeTextDiffEditor = getActiveTextDiffEditor(accessor);
+        const activeTextDiffEditor = getActiveTextDiffEditor(accessor, args);
         const m = activeTextDiffEditor?.getControl()?.getModifiedEditor()?.getModel();
         if (!m) {
             return;
@@ -96,9 +100,9 @@ function registerDiffEditorCommands() {
         const val = configService.getValue(m.uri, key);
         configService.updateValue(m.uri, key, !val);
     }
-    function toggleDiffIgnoreTrimWhitespace(accessor) {
+    function toggleDiffIgnoreTrimWhitespace(accessor, args) {
         const configService = accessor.get(ITextResourceConfigurationService);
-        const activeTextDiffEditor = getActiveTextDiffEditor(accessor);
+        const activeTextDiffEditor = getActiveTextDiffEditor(accessor, args);
         const m = activeTextDiffEditor?.getControl()?.getModifiedEditor()?.getModel();
         if (!m) {
             return;
@@ -107,9 +111,9 @@ function registerDiffEditorCommands() {
         const val = configService.getValue(m.uri, key);
         configService.updateValue(m.uri, key, !val);
     }
-    async function swapDiffSides(accessor) {
+    async function swapDiffSides(accessor, args) {
         const editorService = accessor.get(IEditorService);
-        const diffEditor = getActiveTextDiffEditor(accessor);
+        const diffEditor = getActiveTextDiffEditor(accessor, args);
         const activeGroup = diffEditor?.group;
         const diffInput = diffEditor?.input;
         if (!diffEditor || typeof activeGroup === 'undefined' || !(diffInput instanceof DiffEditorInput) || !diffInput.modified.resource) {
@@ -146,45 +150,45 @@ function registerDiffEditorCommands() {
     }
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: TOGGLE_DIFF_SIDE_BY_SIDE,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: undefined,
         primary: undefined,
-        handler: accessor => toggleDiffSideBySide(accessor)
+        handler: (accessor, ...args) => toggleDiffSideBySide(accessor, args)
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: DIFF_FOCUS_PRIMARY_SIDE,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: undefined,
         primary: undefined,
-        handler: accessor => focusInDiffEditor(accessor, FocusTextDiffEditorMode.Modified)
+        handler: (accessor, ...args) => focusInDiffEditor(accessor, args, FocusTextDiffEditorMode.Modified)
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: DIFF_FOCUS_SECONDARY_SIDE,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: undefined,
         primary: undefined,
-        handler: accessor => focusInDiffEditor(accessor, FocusTextDiffEditorMode.Original)
+        handler: (accessor, ...args) => focusInDiffEditor(accessor, args, FocusTextDiffEditorMode.Original)
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: DIFF_FOCUS_OTHER_SIDE,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: undefined,
         primary: undefined,
-        handler: accessor => focusInDiffEditor(accessor, FocusTextDiffEditorMode.Toggle)
+        handler: (accessor, ...args) => focusInDiffEditor(accessor, args, FocusTextDiffEditorMode.Toggle)
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: undefined,
         primary: undefined,
-        handler: accessor => toggleDiffIgnoreTrimWhitespace(accessor)
+        handler: (accessor, ...args) => toggleDiffIgnoreTrimWhitespace(accessor, args)
     });
     KeybindingsRegistry.registerCommandAndKeybindingRule({
         id: DIFF_SWAP_SIDES,
-        weight: 200 ,
+        weight: KeybindingWeight.WorkbenchContrib,
         when: undefined,
         primary: undefined,
-        handler: accessor => swapDiffSides(accessor)
+        handler: (accessor, ...args) => swapDiffSides(accessor, args)
     });
     MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
         command: {

package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution._autosave.js

@@ -1,3 +1,3 @@
 import { EditorAutoSave } from './editorAutoSave.js';
-import { registerWorkbenchContribution2 } from '../../../common/contributions.js';
-registerWorkbenchContribution2(EditorAutoSave.ID, EditorAutoSave, 2 );
+import { registerWorkbenchContribution2, WorkbenchPhase } from '../../../common/contributions.js';
+registerWorkbenchContribution2(EditorAutoSave.ID, EditorAutoSave, WorkbenchPhase.BlockRestore);

package/vscode/src/vs/workbench/browser/parts/editor/editor.js

@@ -9,6 +9,7 @@ const DEFAULT_EDITOR_PART_OPTIONS = {
     tabActionLocation: 'right',
     tabActionCloseVisibility: true,
     tabActionUnpinVisibility: true,
+    alwaysShowEditorActions: false,
     tabSizing: 'fit',
     tabSizingFixedMinWidth: 50,
     tabSizingFixedMaxWidth: 160,
@@ -83,6 +84,7 @@ function validateEditorPartOptions(options) {
         'highlightModifiedTabs': ( new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['highlightModifiedTabs'])),
         'tabActionCloseVisibility': ( new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['tabActionCloseVisibility'])),
         'tabActionUnpinVisibility': ( new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['tabActionUnpinVisibility'])),
+        'alwaysShowEditorActions': ( new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['alwaysShowEditorActions'])),
         'pinnedTabsOnSeparateRow': ( new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['pinnedTabsOnSeparateRow'])),
         'focusRecentEditorAfterClose': ( new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['focusRecentEditorAfterClose'])),
         'showIcons': ( new BooleanVerifier(DEFAULT_EDITOR_PART_OPTIONS['showIcons'])),