@codingame/monaco-vscode-api 3.2.3 → 4.1.0

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

@@ -32,7 +32,7 @@ import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js'
 import { Codicon } from '../../../../base/common/codicons.js';
 import { defaultBreadcrumbsWidgetStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { Emitter } from '../../../../base/common/event.js';
-import { nativeHoverDelegate } from '../../../../platform/hover/browser/hover.js';
+import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
 var BreadcrumbsControl_1;
 class OutlineItem extends BreadcrumbsItem {
     constructor(model, element, options) {
@@ -181,7 +181,7 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         this._ckBreadcrumbsPossible = BreadcrumbsControl_1.CK_BreadcrumbsPossible.bindTo(this._contextKeyService);
         this._ckBreadcrumbsVisible = BreadcrumbsControl_1.CK_BreadcrumbsVisible.bindTo(this._contextKeyService);
         this._ckBreadcrumbsActive = BreadcrumbsControl_1.CK_BreadcrumbsActive.bindTo(this._contextKeyService);
-        this._hoverDelegate = nativeHoverDelegate;
+        this._hoverDelegate = getDefaultHoverDelegate('mouse');
         this._disposables.add(breadcrumbsService.register(this._editorGroup.id, this._widget));
         this.hide();
     }
@@ -418,7 +418,7 @@ let BreadcrumbsControl = class BreadcrumbsControl {
             }
         }
         else {
-            element.outline.reveal(element, { pinned }, group === SIDE_GROUP);
+            element.outline.reveal(element, { pinned }, group === SIDE_GROUP, false);
         }
     }
     _getEditorGroup(data) {
@@ -520,19 +520,20 @@ registerAction2(class ToggleBreadcrumb extends Action2 {
                 title: ( localizeWithPath(
                     'vs/workbench/browser/parts/editor/breadcrumbsControl',
                     'cmd.toggle2',
-                    "Breadcrumbs"
+                    "Toggle Breadcrumbs"
                 )),
                 mnemonicTitle: ( localizeWithPath(
                     'vs/workbench/browser/parts/editor/breadcrumbsControl',
                     { key: 'miBreadcrumbs2', comment: ['&& denotes a mnemonic'] },
-                    "&&Breadcrumbs"
+                    "Toggle &&Breadcrumbs"
                 ))
             },
             menu: [
                 { id: MenuId.CommandPalette },
                 { id: MenuId.MenubarAppearanceMenu, group: '4_editor', order: 2 },
                 { id: MenuId.NotebookToolbar, group: 'notebookLayout', order: 2 },
-                { id: MenuId.StickyScrollContext }
+                { id: MenuId.StickyScrollContext },
+                { id: MenuId.NotebookStickyScrollContext, group: 'notebookView', order: 2 }
             ]
         });
     }
@@ -790,7 +791,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
             return input.reveal(element, {
                 pinned: true,
                 preserveFocus: false
-            }, true);
+            }, true, false);
         }
     }
 });

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

@@ -13,7 +13,17 @@ import { IConfigurationService } from '../../../../platform/configuration/common
 import { FileKind, IFileService } from '../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { WorkbenchAsyncDataTree, WorkbenchDataTree } from '../../../../platform/list/browser/listService.js';
-import { breadcrumbsPickerBackground, widgetShadow, widgetBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { breadcrumbsPickerBackground, widgetShadow, widgetBorder } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { isWorkspaceFolder, isWorkspace, IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { ResourceLabels, DEFAULT_LABELS_CONTAINER } from '../../labels.js';
 import { BreadcrumbsConfig } from './breadcrumbs.js';
@@ -21,7 +31,6 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.js
 import { localizeWithPath } from '../../../../nls.js';
 import { SIDE_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
-import { nativeHoverDelegate } from '../../../../platform/hover/browser/hover.js';
 let BreadcrumbsPicker = class BreadcrumbsPicker {
     constructor(parent, resource, _instantiationService, _themeService, _configurationService) {
         this.resource = resource;
@@ -158,14 +167,13 @@ FileDataSource = ( __decorate([
     ( __param(0, IFileService))
 ], FileDataSource));
 let FileRenderer = class FileRenderer {
-    constructor(_labels, _hoverDelegate, _configService) {
+    constructor(_labels, _configService) {
         this._labels = _labels;
-        this._hoverDelegate = _hoverDelegate;
         this._configService = _configService;
         this.templateId = 'FileStat';
     }
     renderTemplate(container) {
-        return this._labels.create(container, { supportHighlights: true, hoverDelegate: this._hoverDelegate });
+        return this._labels.create(container, { supportHighlights: true });
     }
     renderElement(node, index, templateData) {
         const fileDecorations = this._configService.getValue('explorer.decorations');
@@ -193,7 +201,7 @@ let FileRenderer = class FileRenderer {
     }
 };
 FileRenderer = ( __decorate([
-    ( __param(2, IConfigurationService))
+    ( __param(1, IConfigurationService))
 ], FileRenderer));
 class FileNavigationLabelProvider {
     getKeyboardNavigationLabel(element) {
@@ -294,7 +302,7 @@ let BreadcrumbsFilePicker = class BreadcrumbsFilePicker extends BreadcrumbsPicke
         onFileIconThemeChange(this._themeService.getFileIconTheme());
         const labels = this._instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER );
         this._disposables.add(labels);
-        return this._instantiationService.createInstance(WorkbenchAsyncDataTree, 'BreadcrumbsFilePicker', container, ( new FileVirtualDelegate()), [this._instantiationService.createInstance(FileRenderer, labels, nativeHoverDelegate)], this._instantiationService.createInstance(FileDataSource), {
+        return this._instantiationService.createInstance(WorkbenchAsyncDataTree, 'BreadcrumbsFilePicker', container, ( new FileVirtualDelegate()), [this._instantiationService.createInstance(FileRenderer, labels)], this._instantiationService.createInstance(FileDataSource), {
             multipleSelectionSupport: false,
             sorter: ( new FileSorter()),
             filter: this._instantiationService.createInstance(FileFilter),
@@ -405,7 +413,7 @@ class BreadcrumbsOutlinePicker extends BreadcrumbsPicker {
     async _revealElement(element, options, sideBySide) {
         this._onWillPickElement.fire();
         const outline = this._tree.getInput();
-        await outline.reveal(element, options, sideBySide);
+        await outline.reveal(element, options, sideBySide, false);
         return true;
     }
 }

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

@@ -0,0 +1,217 @@
+import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
+import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingsRegistry } 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';
+import { IEditorService } from '../../../services/editor/common/editorService.js';
+const TOGGLE_DIFF_SIDE_BY_SIDE = 'toggle.diff.renderSideBySide';
+const GOTO_NEXT_CHANGE = 'workbench.action.compareEditor.nextChange';
+const GOTO_PREVIOUS_CHANGE = 'workbench.action.compareEditor.previousChange';
+const DIFF_FOCUS_PRIMARY_SIDE = 'workbench.action.compareEditor.focusPrimarySide';
+const DIFF_FOCUS_SECONDARY_SIDE = 'workbench.action.compareEditor.focusSecondarySide';
+const DIFF_FOCUS_OTHER_SIDE = 'workbench.action.compareEditor.focusOtherSide';
+const DIFF_OPEN_SIDE = 'workbench.action.compareEditor.openSide';
+const TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE = 'toggle.diff.ignoreTrimWhitespace';
+const DIFF_SWAP_SIDES = 'workbench.action.compareEditor.swapSides';
+function registerDiffEditorCommands() {
+    KeybindingsRegistry.registerCommandAndKeybindingRule({
+        id: GOTO_NEXT_CHANGE,
+        weight: 200 ,
+        when: TextCompareEditorVisibleContext,
+        primary: 512  | 63 ,
+        handler: accessor => navigateInDiffEditor(accessor, true)
+    });
+    MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+        command: {
+            id: GOTO_NEXT_CHANGE,
+            title: ( localize2WithPath(
+                'vs/workbench/browser/parts/editor/diffEditorCommands',
+                'compare.nextChange',
+                'Go to Next Change'
+            )),
+        }
+    });
+    KeybindingsRegistry.registerCommandAndKeybindingRule({
+        id: GOTO_PREVIOUS_CHANGE,
+        weight: 200 ,
+        when: TextCompareEditorVisibleContext,
+        primary: 512  | 1024  | 63 ,
+        handler: accessor => navigateInDiffEditor(accessor, false)
+    });
+    MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+        command: {
+            id: GOTO_PREVIOUS_CHANGE,
+            title: ( localize2WithPath(
+                'vs/workbench/browser/parts/editor/diffEditorCommands',
+                'compare.previousChange',
+                'Go to Previous Change'
+            )),
+        }
+    });
+    function getActiveTextDiffEditor(accessor) {
+        const editorService = accessor.get(IEditorService);
+        for (const editor of [editorService.activeEditorPane, ...editorService.visibleEditorPanes]) {
+            if (editor instanceof TextDiffEditor) {
+                return editor;
+            }
+        }
+        return undefined;
+    }
+    function navigateInDiffEditor(accessor, next) {
+        const activeTextDiffEditor = getActiveTextDiffEditor(accessor);
+        if (activeTextDiffEditor) {
+            activeTextDiffEditor.getControl()?.goToDiff(next ? 'next' : 'previous');
+        }
+    }
+    let FocusTextDiffEditorMode;
+    ( (function(FocusTextDiffEditorMode) {
+        FocusTextDiffEditorMode[FocusTextDiffEditorMode["Original"] = 0] = "Original";
+        FocusTextDiffEditorMode[FocusTextDiffEditorMode["Modified"] = 1] = "Modified";
+        FocusTextDiffEditorMode[FocusTextDiffEditorMode["Toggle"] = 2] = "Toggle";
+    })(FocusTextDiffEditorMode || (FocusTextDiffEditorMode = {})));
+    function focusInDiffEditor(accessor, mode) {
+        const activeTextDiffEditor = getActiveTextDiffEditor(accessor);
+        if (activeTextDiffEditor) {
+            switch (mode) {
+                case FocusTextDiffEditorMode.Original:
+                    activeTextDiffEditor.getControl()?.getOriginalEditor().focus();
+                    break;
+                case FocusTextDiffEditorMode.Modified:
+                    activeTextDiffEditor.getControl()?.getModifiedEditor().focus();
+                    break;
+                case FocusTextDiffEditorMode.Toggle:
+                    if (activeTextDiffEditor.getControl()?.getModifiedEditor().hasWidgetFocus()) {
+                        return focusInDiffEditor(accessor, FocusTextDiffEditorMode.Original);
+                    }
+                    else {
+                        return focusInDiffEditor(accessor, FocusTextDiffEditorMode.Modified);
+                    }
+            }
+        }
+    }
+    function toggleDiffSideBySide(accessor) {
+        const configurationService = accessor.get(IConfigurationService);
+        const newValue = !configurationService.getValue('diffEditor.renderSideBySide');
+        configurationService.updateValue('diffEditor.renderSideBySide', newValue);
+    }
+    function toggleDiffIgnoreTrimWhitespace(accessor) {
+        const configurationService = accessor.get(IConfigurationService);
+        const newValue = !configurationService.getValue('diffEditor.ignoreTrimWhitespace');
+        configurationService.updateValue('diffEditor.ignoreTrimWhitespace', newValue);
+    }
+    async function swapDiffSides(accessor) {
+        const editorService = accessor.get(IEditorService);
+        const diffEditor = getActiveTextDiffEditor(accessor);
+        const activeGroup = diffEditor?.group;
+        const diffInput = diffEditor?.input;
+        if (!diffEditor || typeof activeGroup === 'undefined' || !(diffInput instanceof DiffEditorInput) || !diffInput.modified.resource) {
+            return;
+        }
+        const untypedDiffInput = diffInput.toUntyped({ preserveViewState: activeGroup.id, preserveResource: true });
+        if (!untypedDiffInput) {
+            return;
+        }
+        if (diffInput.modified.isModified() && editorService.findEditors({ resource: diffInput.modified.resource, typeId: diffInput.modified.typeId, editorId: diffInput.modified.editorId }).length === 0) {
+            await editorService.openEditor({
+                ...untypedDiffInput.modified,
+                options: {
+                    ...untypedDiffInput.modified.options,
+                    pinned: true,
+                    inactive: true
+                }
+            }, activeGroup);
+        }
+        await editorService.replaceEditors([
+            {
+                editor: diffInput,
+                replacement: {
+                    ...untypedDiffInput,
+                    original: untypedDiffInput.modified,
+                    modified: untypedDiffInput.original,
+                    options: {
+                        ...untypedDiffInput.options,
+                        pinned: true
+                    }
+                }
+            }
+        ], activeGroup);
+    }
+    KeybindingsRegistry.registerCommandAndKeybindingRule({
+        id: TOGGLE_DIFF_SIDE_BY_SIDE,
+        weight: 200 ,
+        when: undefined,
+        primary: undefined,
+        handler: accessor => toggleDiffSideBySide(accessor)
+    });
+    KeybindingsRegistry.registerCommandAndKeybindingRule({
+        id: DIFF_FOCUS_PRIMARY_SIDE,
+        weight: 200 ,
+        when: undefined,
+        primary: undefined,
+        handler: accessor => focusInDiffEditor(accessor, FocusTextDiffEditorMode.Modified)
+    });
+    KeybindingsRegistry.registerCommandAndKeybindingRule({
+        id: DIFF_FOCUS_SECONDARY_SIDE,
+        weight: 200 ,
+        when: undefined,
+        primary: undefined,
+        handler: accessor => focusInDiffEditor(accessor, FocusTextDiffEditorMode.Original)
+    });
+    KeybindingsRegistry.registerCommandAndKeybindingRule({
+        id: DIFF_FOCUS_OTHER_SIDE,
+        weight: 200 ,
+        when: undefined,
+        primary: undefined,
+        handler: accessor => focusInDiffEditor(accessor, FocusTextDiffEditorMode.Toggle)
+    });
+    KeybindingsRegistry.registerCommandAndKeybindingRule({
+        id: TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE,
+        weight: 200 ,
+        when: undefined,
+        primary: undefined,
+        handler: accessor => toggleDiffIgnoreTrimWhitespace(accessor)
+    });
+    KeybindingsRegistry.registerCommandAndKeybindingRule({
+        id: DIFF_SWAP_SIDES,
+        weight: 200 ,
+        when: undefined,
+        primary: undefined,
+        handler: accessor => swapDiffSides(accessor)
+    });
+    MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+        command: {
+            id: TOGGLE_DIFF_SIDE_BY_SIDE,
+            title: ( localize2WithPath(
+                'vs/workbench/browser/parts/editor/diffEditorCommands',
+                'toggleInlineView',
+                "Toggle Inline View"
+            )),
+            category: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/diffEditorCommands',
+                'compare',
+                "Compare"
+            ))
+        },
+        when: TextCompareEditorActiveContext
+    });
+    MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+        command: {
+            id: DIFF_SWAP_SIDES,
+            title: ( localize2WithPath(
+                'vs/workbench/browser/parts/editor/diffEditorCommands',
+                'swapDiffSides',
+                "Swap Left and Right Editor Side"
+            )),
+            category: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/diffEditorCommands',
+                'compare',
+                "Compare"
+            ))
+        },
+        when: ( ContextKeyExpr.and(TextCompareEditorActiveContext, ActiveCompareEditorCanSwapContext))
+    });
+}
+export { DIFF_FOCUS_OTHER_SIDE, DIFF_FOCUS_PRIMARY_SIDE, DIFF_FOCUS_SECONDARY_SIDE, DIFF_OPEN_SIDE, DIFF_SWAP_SIDES, GOTO_NEXT_CHANGE, GOTO_PREVIOUS_CHANGE, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, TOGGLE_DIFF_SIDE_BY_SIDE, registerDiffEditorCommands };

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

@@ -2,7 +2,7 @@ import { Registry } from '../../../../platform/registry/common/platform.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { EditorPaneDescriptor } from '../../editor.js';
 import { EditorExtensions } from '../../../common/editor.js';
-import { IsAuxiliaryEditorPartContext, ActiveEditorGroupLockedContext, EditorPartMultipleEditorGroupsContext, MultipleEditorGroupsContext, InEditorZenModeContext, EditorGroupEditorsCountContext, ActiveEditorLastInGroupContext, EditorTabsVisibleContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorPinnedContext, ActiveEditorStickyContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, EditorPartMaximizedEditorGroupContext, TextCompareEditorActiveContext, ActiveEditorDirtyContext, ActiveCompareEditorOriginalWriteableContext } from '../../../common/contextkeys.js';
+import { IsAuxiliaryEditorPartContext, ActiveEditorGroupLockedContext, EditorPartMultipleEditorGroupsContext, MultipleEditorGroupsContext, InEditorZenModeContext, EditorGroupEditorsCountContext, ActiveEditorLastInGroupContext, EditorTabsVisibleContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorPinnedContext, ActiveEditorStickyContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, EditorPartMaximizedEditorGroupContext, TextCompareEditorActiveContext, ActiveEditorDirtyContext, ActiveCompareEditorCanSwapContext } from '../../../common/contextkeys.js';
 import { SideBySideEditorInput, SideBySideEditorInputSerializer } from '../../../common/editor/sideBySideEditorInput.js';
 import { TextResourceEditor } from './textResourceEditor.js';
 import { SideBySideEditor } from './sideBySideEditor.js';
@@ -16,7 +16,8 @@ import { Categories } from '../../../../platform/action/common/actionCommonCateg
 import { registerAction2, MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { ShowEditorsInActiveGroupByMostRecentlyUsedAction, ShowAllEditorsByAppearanceAction, ShowAllEditorsByMostRecentlyUsedAction, NavigateBackwardsAction, NavigateForwardAction, ReopenClosedEditorAction, ClearRecentFilesAction, EditorLayoutSingleAction, EditorLayoutTwoColumnsAction, EditorLayoutThreeColumnsAction, EditorLayoutTwoRowsAction, EditorLayoutThreeRowsAction, EditorLayoutTwoByTwoGridAction, EditorLayoutTwoRowsRightAction, EditorLayoutTwoColumnsBottomAction, OpenNextEditor, OpenPreviousEditor, OpenNextEditorInGroup, OpenPreviousEditorInGroup, OpenFirstEditorInGroup, OpenLastEditorInGroup, OpenNextRecentlyUsedEditorAction, OpenPreviousRecentlyUsedEditorAction, OpenNextRecentlyUsedEditorInGroupAction, OpenPreviousRecentlyUsedEditorInGroupAction, CloseAllEditorsAction, CloseAllEditorGroupsAction, CloseLeftEditorsInGroupAction, CloseEditorsInOtherGroupsAction, CloseEditorInAllGroupsAction, RevertAndCloseEditorAction, SplitEditorAction, SplitEditorOrthogonalAction, SplitEditorLeftAction, SplitEditorRightAction, SplitEditorUpAction, SplitEditorDownAction, JoinTwoGroupsAction, JoinAllGroupsAction, NavigateBetweenGroupsAction, ResetGroupSizesAction, ToggleGroupSizesAction, MaximizeGroupHideSidebarAction, ToggleMaximizeEditorGroupAction, MinimizeOtherGroupsAction, MinimizeOtherGroupsHideSidebarAction, MoveEditorLeftInGroupAction, MoveEditorRightInGroupAction, MoveGroupLeftAction, MoveGroupRightAction, MoveGroupUpAction, MoveGroupDownAction, DuplicateGroupLeftAction, DuplicateGroupRightAction, DuplicateGroupUpAction, DuplicateGroupDownAction, MoveEditorToPreviousGroupAction, MoveEditorToNextGroupAction, MoveEditorToFirstGroupAction, MoveEditorToLastGroupAction, MoveEditorToLeftGroupAction, MoveEditorToRightGroupAction, MoveEditorToAboveGroupAction, MoveEditorToBelowGroupAction, SplitEditorToPreviousGroupAction, SplitEditorToNextGroupAction, SplitEditorToFirstGroupAction, SplitEditorToLastGroupAction, SplitEditorToLeftGroupAction, SplitEditorToRightGroupAction, SplitEditorToAboveGroupAction, SplitEditorToBelowGroupAction, FocusActiveGroupAction, FocusFirstGroupAction, FocusLastGroupAction, FocusPreviousGroup, FocusNextGroup, FocusLeftGroup, FocusRightGroup, FocusAboveGroup, FocusBelowGroup, NewEditorGroupLeftAction, NewEditorGroupRightAction, NewEditorGroupAboveAction, NewEditorGroupBelowAction, NavigatePreviousAction, NavigateForwardInEditsAction, NavigateBackwardsInEditsAction, NavigatePreviousInEditsAction, NavigateToLastEditLocationAction, NavigateForwardInNavigationsAction, NavigateBackwardsInNavigationsAction, NavigatePreviousInNavigationsAction, NavigateToLastNavigationLocationAction, ClearEditorHistoryAction, ToggleEditorTypeAction, ReOpenInTextEditorAction, QuickAccessPreviousRecentlyUsedEditorAction, QuickAccessLeastRecentlyUsedEditorAction, QuickAccessPreviousRecentlyUsedEditorInGroupAction, QuickAccessLeastRecentlyUsedEditorInGroupAction, QuickAccessPreviousEditorFromHistoryAction, MoveEditorToNewWindowAction, CopyEditorToNewindowAction, MoveEditorGroupToNewWindowAction, CopyEditorGroupToNewWindowAction, RestoreEditorsToMainWindowAction, NewEmptyEditorWindowAction } from './editorActions.js';
-import { setup, LOCK_GROUP_COMMAND_ID, UNLOCK_GROUP_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, TOGGLE_LOCK_GROUP_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, REOPEN_WITH_COMMAND_ID, KEEP_EDITOR_COMMAND_ID, PIN_EDITOR_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, SPLIT_EDITOR_IN_GROUP, JOIN_EDITOR_IN_GROUP, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, TOGGLE_DIFF_SIDE_BY_SIDE, SHOW_EDITORS_IN_GROUP, TOGGLE_KEEP_EDITORS_COMMAND_ID, TOGGLE_MAXIMIZE_EDITOR_GROUP, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_SECOND_SIDE_EDITOR, SPLIT_EDITOR, GOTO_PREVIOUS_CHANGE, GOTO_NEXT_CHANGE, DIFF_SWAP_SIDES, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT } from './editorCommands.js';
+import { setup, LOCK_GROUP_COMMAND_ID, UNLOCK_GROUP_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, TOGGLE_LOCK_GROUP_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, REOPEN_WITH_COMMAND_ID, KEEP_EDITOR_COMMAND_ID, PIN_EDITOR_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, SPLIT_EDITOR_IN_GROUP, JOIN_EDITOR_IN_GROUP, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, SHOW_EDITORS_IN_GROUP, TOGGLE_KEEP_EDITORS_COMMAND_ID, TOGGLE_MAXIMIZE_EDITOR_GROUP, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_SECOND_SIDE_EDITOR, SPLIT_EDITOR, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT } from './editorCommands.js';
+import { TOGGLE_DIFF_SIDE_BY_SIDE, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, GOTO_PREVIOUS_CHANGE, GOTO_NEXT_CHANGE, DIFF_SWAP_SIDES } from './diffEditorCommands.js';
 import { getQuickNavigateHandler, inQuickPickContext } from '../../quickaccess.js';
 import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
@@ -644,16 +645,6 @@ const previousChangeIcon = registerIcon('diff-editor-previous-change', Codicon.a
     'previousChangeIcon',
     'Icon for the previous change action in the diff editor.'
 )));
-const nextChangeIcon = registerIcon('diff-editor-next-change', Codicon.arrowDown, ( localizeWithPath(
-    'vs/workbench/browser/parts/editor/editor.contribution',
-    'nextChangeIcon',
-    'Icon for the next change action in the diff editor.'
-)));
-const toggleWhitespace = registerIcon('diff-editor-toggle-whitespace', Codicon.whitespace, ( localizeWithPath(
-    'vs/workbench/browser/parts/editor/editor.contribution',
-    'toggleWhitespace',
-    'Icon for the toggle whitespace action in the diff editor.'
-)));
 appendEditorToolItem({
     id: GOTO_PREVIOUS_CHANGE,
     title: ( localizeWithPath(
@@ -663,6 +654,11 @@ appendEditorToolItem({
     )),
     icon: previousChangeIcon
 }, TextCompareEditorActiveContext, 10, undefined, EditorContextKeys.hasChanges);
+const nextChangeIcon = registerIcon('diff-editor-next-change', Codicon.arrowDown, ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'nextChangeIcon',
+    'Icon for the next change action in the diff editor.'
+)));
 appendEditorToolItem({
     id: GOTO_NEXT_CHANGE,
     title: ( localizeWithPath(
@@ -680,10 +676,12 @@ appendEditorToolItem({
         "Swap Left and Right Side"
     )),
     icon: Codicon.arrowSwap
-}, ( ContextKeyExpr.and(
-    TextCompareEditorActiveContext,
-    ActiveCompareEditorOriginalWriteableContext
-)), 15, undefined, undefined);
+}, ( ContextKeyExpr.and(TextCompareEditorActiveContext, ActiveCompareEditorCanSwapContext)), 15, undefined, undefined);
+const toggleWhitespace = registerIcon('diff-editor-toggle-whitespace', Codicon.whitespace, ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'toggleWhitespace',
+    'Icon for the toggle whitespace action in the diff editor.'
+)));
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE,

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
+import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { Action } from '../../../../base/common/actions.js';
 import { firstOrDefault } from '../../../../base/common/arrays.js';
 import { EditorResourceAccessor, DEFAULT_EDITOR_ASSOCIATION } from '../../../common/editor.js';
@@ -8,7 +8,7 @@ import { IWorkbenchLayoutService } from '../../../services/layout/browser/layout
 import { IHistoryService } from '../../../services/history/common/history.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { CLOSE_EDITOR_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, SPLIT_EDITOR, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, COPY_ACTIVE_EDITOR_COMMAND_ID, LAYOUT_EDITOR_GROUPS_COMMAND_ID, splitEditor, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, TOGGLE_MAXIMIZE_EDITOR_GROUP, resolveCommandsContext, getCommandsContext, MOVE_ACTIVE_EDITOR_COMMAND_ID, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID } from './editorCommands.js';
+import { SPLIT_EDITOR, SPLIT_EDITOR_UP, SPLIT_EDITOR_DOWN, CLOSE_EDITOR_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, LAYOUT_EDITOR_GROUPS_COMMAND_ID, splitEditor, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, TOGGLE_MAXIMIZE_EDITOR_GROUP, resolveCommandsContext, getCommandsContext, MOVE_ACTIVE_EDITOR_COMMAND_ID, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID } from './editorCommands.js';
 import { IEditorGroupsService, preferredSideBySideGroupDirection } from '../../../services/editor/common/editorGroupsService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';

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

@@ -49,7 +49,7 @@ let EditorAutoSave = class EditorAutoSave extends Disposable {
             const workingCopyResult = this.waitingOnConditionAutoSaveWorkingCopies.get(resource);
             if (workingCopyResult?.condition === condition) {
                 if (workingCopyResult.workingCopy.isDirty() &&
-                    this.filesConfigurationService.getAutoSaveMode(workingCopyResult.workingCopy.resource).mode !== 0 ) {
+                    this.filesConfigurationService.getAutoSaveMode(workingCopyResult.workingCopy.resource, workingCopyResult.reason).mode !== 0 ) {
                     this.discardAutoSave(workingCopyResult.workingCopy);
                     this.logService.info(`[editor auto save] running auto save from condition change event`, ( workingCopyResult.workingCopy.resource.toString()), workingCopyResult.workingCopy.typeId);
                     workingCopyResult.workingCopy.save({ reason: workingCopyResult.reason });
@@ -60,7 +60,7 @@ let EditorAutoSave = class EditorAutoSave extends Disposable {
                 if (editorResult?.condition === condition &&
                     !editorResult.editor.editor.isDisposed() &&
                     editorResult.editor.editor.isDirty() &&
-                    this.filesConfigurationService.getAutoSaveMode(editorResult.editor.editor).mode !== 0 ) {
+                    this.filesConfigurationService.getAutoSaveMode(editorResult.editor.editor, editorResult.reason).mode !== 0 ) {
                     this.waitingOnConditionAutoSaveEditors.delete(resource);
                     this.logService.info(`[editor auto save] running auto save from condition change event with reason ${editorResult.reason}`);
                     this.editorService.save(editorResult.editor, { reason: editorResult.reason });
@@ -98,7 +98,7 @@ let EditorAutoSave = class EditorAutoSave extends Disposable {
                 editorIdentifier.editor.hasCapability(4 )) {
                 return;
             }
-            const autoSaveMode = this.filesConfigurationService.getAutoSaveMode(editorIdentifier.editor);
+            const autoSaveMode = this.filesConfigurationService.getAutoSaveMode(editorIdentifier.editor, reason);
             if (autoSaveMode.mode !== 0 ) {
                 if ((reason === 4  && ((autoSaveMode.mode === 3  || autoSaveMode.mode === 4) )) ||
                     ((reason === 3  && autoSaveMode.mode === 3) )) {
@@ -137,7 +137,7 @@ let EditorAutoSave = class EditorAutoSave extends Disposable {
             if (workingCopy.capabilities & 2 ) {
                 continue;
             }
-            const autoSaveMode = this.filesConfigurationService.getAutoSaveMode(workingCopy.resource);
+            const autoSaveMode = this.filesConfigurationService.getAutoSaveMode(workingCopy.resource, reason);
             if (autoSaveMode.mode !== 0 ) {
                 workingCopy.save({ reason });
             }
@@ -180,13 +180,14 @@ let EditorAutoSave = class EditorAutoSave extends Disposable {
         const handle = setTimeout(() => {
             this.discardAutoSave(workingCopy);
             if (workingCopy.isDirty()) {
-                const autoSaveMode = this.filesConfigurationService.getAutoSaveMode(workingCopy.resource);
+                const reason = 2 ;
+                const autoSaveMode = this.filesConfigurationService.getAutoSaveMode(workingCopy.resource, reason);
                 if (autoSaveMode.mode !== 0 ) {
                     this.logService.trace(`[editor auto save] running auto save`, ( workingCopy.resource.toString()), workingCopy.typeId);
-                    workingCopy.save({ reason: 2  });
+                    workingCopy.save({ reason });
                 }
                 else if (autoSaveMode.reason === 3  || autoSaveMode.reason === 4 ) {
-                    this.waitingOnConditionAutoSaveWorkingCopies.set(workingCopy.resource, { workingCopy, reason: 2 , condition: autoSaveMode.reason });
+                    this.waitingOnConditionAutoSaveWorkingCopies.set(workingCopy.resource, { workingCopy, reason, condition: autoSaveMode.reason });
                 }
             }
         }, autoSaveAfterDelay);