@codingame/monaco-vscode-api 3.2.3 → 4.1.0

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

@@ -10,7 +10,7 @@ import { isDiffEditor } from '../../../../editor/browser/editorBrowser.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
-import { MenuRegistry, MenuId, registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
 import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
@@ -24,7 +24,7 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
 import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess } from './editorQuickAccess.js';
 import { SideBySideEditor } from './sideBySideEditor.js';
 import { TextDiffEditor } from './textDiffEditor.js';
-import { TextCompareEditorVisibleContext, TextCompareEditorActiveContext, ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, ActiveEditorGroupLockedContext, ActiveEditorStickyContext } from '../../../common/contextkeys.js';
+import { ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, TextCompareEditorActiveContext, ActiveEditorGroupLockedContext, ActiveEditorStickyContext } from '../../../common/contextkeys.js';
 import { isEditorInputWithOptionsAndGroup, isEditorIdentifier } from '../../../common/editor.js';
 import { DiffEditorInput } from '../../../common/editor/diffEditorInput.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
@@ -34,6 +34,7 @@ import { IEditorResolverService } from '../../../services/editor/common/editorRe
 import { IEditorService, SIDE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IPathService } from '../../../services/path/common/pathService.js';
 import { IUntitledTextEditorService } from '../../../services/untitled/common/untitledTextEditorService.js';
+import { registerDiffEditorCommands, DIFF_FOCUS_SECONDARY_SIDE, DIFF_FOCUS_PRIMARY_SIDE, DIFF_FOCUS_OTHER_SIDE, DIFF_OPEN_SIDE } from './diffEditorCommands.js';
 const CLOSE_SAVED_EDITORS_COMMAND_ID = 'workbench.action.closeUnmodifiedEditors';
 const CLOSE_EDITORS_IN_GROUP_COMMAND_ID = 'workbench.action.closeEditorsInGroup';
 const CLOSE_EDITORS_AND_GROUP_COMMAND_ID = 'workbench.action.closeEditorsAndGroup';
@@ -54,15 +55,6 @@ const SHOW_EDITORS_IN_GROUP = 'workbench.action.showEditorsInGroup';
 const REOPEN_WITH_COMMAND_ID = 'workbench.action.reopenWithEditor';
 const PIN_EDITOR_COMMAND_ID = 'workbench.action.pinEditor';
 const UNPIN_EDITOR_COMMAND_ID = 'workbench.action.unpinEditor';
-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';
 const SPLIT_EDITOR = 'workbench.action.splitEditor';
 const SPLIT_EDITOR_UP = 'workbench.action.splitEditorUp';
 const SPLIT_EDITOR_DOWN = 'workbench.action.splitEditorDown';
@@ -344,196 +336,6 @@ function registerEditorGroupsLayoutCommands() {
         }
     });
 }
-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/editorCommands',
-                '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/editorCommands',
-                '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/editorCommands',
-                'toggleInlineView',
-                "Toggle Inline View"
-            )),
-            category: ( localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'compare', "Compare"))
-        },
-        when: TextCompareEditorActiveContext
-    });
-    MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
-        command: {
-            id: DIFF_SWAP_SIDES,
-            title: ( localize2WithPath(
-                'vs/workbench/browser/parts/editor/editorCommands',
-                'swapDiffSides',
-                "Swap Left and Right Editor Side"
-            )),
-            category: ( localizeWithPath('vs/workbench/browser/parts/editor/editorCommands', 'compare', "Compare"))
-        },
-        when: TextCompareEditorActiveContext
-    });
-}
 function registerOpenEditorAPICommands() {
     function mixinContext(context, options, column) {
         if (!context) {
@@ -1459,4 +1261,4 @@ function setup() {
     registerSplitEditorCommands();
     registerFocusEditorGroupWihoutWrapCommands();
 }
-export { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID, API_OPEN_WITH_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, DIFF_FOCUS_OTHER_SIDE, DIFF_FOCUS_PRIMARY_SIDE, DIFF_FOCUS_SECONDARY_SIDE, DIFF_OPEN_SIDE, DIFF_SWAP_SIDES, EDITOR_CORE_NAVIGATION_COMMANDS, FOCUS_ABOVE_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_BELOW_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_LEFT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_OTHER_SIDE_EDITOR, FOCUS_RIGHT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_SECOND_SIDE_EDITOR, GOTO_NEXT_CHANGE, GOTO_PREVIOUS_CHANGE, JOIN_EDITOR_IN_GROUP, KEEP_EDITOR_COMMAND_ID, LAYOUT_EDITOR_GROUPS_COMMAND_ID, LOCK_GROUP_COMMAND_ID, MOVE_ACTIVE_EDITOR_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, OPEN_EDITOR_AT_INDEX_COMMAND_ID, PIN_EDITOR_COMMAND_ID, REOPEN_WITH_COMMAND_ID, SHOW_EDITORS_IN_GROUP, SPLIT_EDITOR, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_IN_GROUP, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, TOGGLE_DIFF_SIDE_BY_SIDE, TOGGLE_KEEP_EDITORS_COMMAND_ID, TOGGLE_LOCK_GROUP_COMMAND_ID, TOGGLE_MAXIMIZE_EDITOR_GROUP, TOGGLE_SPLIT_EDITOR_IN_GROUP, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, UNLOCK_GROUP_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, getCommandsContext, getMultiSelectedEditorContexts, resolveCommandsContext, setup, splitEditor };
+export { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID, API_OPEN_WITH_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, EDITOR_CORE_NAVIGATION_COMMANDS, FOCUS_ABOVE_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_BELOW_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_LEFT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_OTHER_SIDE_EDITOR, FOCUS_RIGHT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_SECOND_SIDE_EDITOR, JOIN_EDITOR_IN_GROUP, KEEP_EDITOR_COMMAND_ID, LAYOUT_EDITOR_GROUPS_COMMAND_ID, LOCK_GROUP_COMMAND_ID, MOVE_ACTIVE_EDITOR_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, OPEN_EDITOR_AT_INDEX_COMMAND_ID, PIN_EDITOR_COMMAND_ID, REOPEN_WITH_COMMAND_ID, SHOW_EDITORS_IN_GROUP, SPLIT_EDITOR, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_IN_GROUP, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, TOGGLE_KEEP_EDITORS_COMMAND_ID, TOGGLE_LOCK_GROUP_COMMAND_ID, TOGGLE_MAXIMIZE_EDITOR_GROUP, TOGGLE_SPLIT_EDITOR_IN_GROUP, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, UNLOCK_GROUP_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, getCommandsContext, getMultiSelectedEditorContexts, resolveCommandsContext, setup, splitEditor };

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

@@ -74,7 +74,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
         })();
     }
     registerListeners() {
-        Event.debounce(this.editorResolverService.onDidChangeEditorRegistrations, (_, e) => e)(() => this.updateDynamicEditorConfigurations());
+        this._register(Event.debounce(this.editorResolverService.onDidChangeEditorRegistrations, (_, e) => e)(() => this.updateDynamicEditorConfigurations()));
     }
     updateDynamicEditorConfigurations() {
         const lockableEditors = [...this.editorResolverService.getEditors(), ...DynamicEditorConfigurations_1.AUTO_LOCK_EXTRA_EDITORS].filter(e => !( DynamicEditorConfigurations_1.AUTO_LOCK_REMOVE_EDITORS.has(e.id)));

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

@@ -11,7 +11,17 @@ import { localizeWithPath } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-import { activeContrastBorder } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import { activeContrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import '../../../../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 { Themable, IThemeService } from '../../../../platform/theme/common/themeService.js';
 import { isTemporaryWorkspace, IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
 import { LocalSelectionTransfer, Extensions, containsDragType, CodeDataTransfers } from '../../../../platform/dnd/browser/dnd.js';

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

@@ -6,12 +6,22 @@ import { ResourceContextKey, ActiveEditorDirtyContext, ActiveEditorPinnedContext
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { Emitter, Relay } from '../../../../base/common/event.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { addDisposableListener, EventHelper, EventType, getWindow, trackFocus, getActiveElement, isActiveElement, focusWindow, isAncestor, Dimension, isMouseEvent, findParentWithClass } from '../../../../base/browser/dom.js';
+import { addDisposableListener, EventHelper, EventType, getWindow, trackFocus, getActiveElement, isActiveElement, isAncestor, Dimension, isMouseEvent, findParentWithClass } from '../../../../base/browser/dom.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
 import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';
 import { Themable, IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { contrastBorder, editorBackground } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import { contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorBackground } 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 { EDITOR_GROUP_EMPTY_BACKGROUND, EDITOR_GROUP_HEADER_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, EDITOR_GROUP_HEADER_NO_TABS_BACKGROUND } from '../../../common/theme.js';
 import { EditorPanes } from './editorPanes.js';
 import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
@@ -37,6 +47,7 @@ import { Schemas } from '../../../../base/common/network.js';
 import { EditorActivation } from '../../../../platform/editor/common/editor.js';
 import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { URI } from '../../../../base/common/uri.js';
 import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
 import { isNative, isWindows, isLinux, isMacintosh } from '../../../../base/common/platform.js';
 import { ILogService } from '../../../../platform/log/common/log.js';
@@ -47,7 +58,7 @@ import { EditorTitleControl } from './editorTitleControl.js';
 import { EditorPane } from './editorPane.js';
 import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.js';
 import { IHostService } from '../../../services/host/browser/host.js';
-import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.js';
+import { IFileDialogService, IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 var EditorGroupView_1;
 let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable {
     static createNew(editorPartsView, groupsView, groupsLabel, groupIndex, instantiationService) {
@@ -59,7 +70,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     static createCopy(copyFrom, editorPartsView, groupsView, groupsLabel, groupIndex, instantiationService) {
         return instantiationService.createInstance(EditorGroupView_1, copyFrom, editorPartsView, groupsView, groupsLabel, groupIndex);
     }
-    constructor(from, editorPartsView, groupsView, groupsLabel, _index, instantiationService, contextKeyService, themeService, telemetryService, keybindingService, menuService, contextMenuService, fileDialogService, editorService, filesConfigurationService, uriIdentityService, logService, editorResolverService, hostService) {
+    constructor(from, editorPartsView, groupsView, groupsLabel, _index, instantiationService, contextKeyService, themeService, telemetryService, keybindingService, menuService, contextMenuService, fileDialogService, editorService, filesConfigurationService, uriIdentityService, logService, editorResolverService, hostService, dialogService) {
         super(themeService);
         this.editorPartsView = editorPartsView;
         this.groupsView = groupsView;
@@ -78,6 +89,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this.logService = logService;
         this.editorResolverService = editorResolverService;
         this.hostService = hostService;
+        this.dialogService = dialogService;
         this._onDidFocus = this._register(( new Emitter()));
         this.onDidFocus = this._onDidFocus.event;
         this._onWillDispose = this._register(( new Emitter()));
@@ -202,7 +214,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                         groupActiveEditorPinnedContext.set(this.model.isPinned(this.model.activeEditor));
                     }
                     break;
-                case 11 :
+                case 12 :
                     if (e.editor && e.editor === this.model.activeEditor) {
                         groupActiveEditorStickyContext.set(this.model.isSticky(this.model.activeEditor));
                     }
@@ -368,6 +380,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this._register(this.model.onDidModelChange(e => this.onDidGroupModelChange(e)));
         this._register(this.groupsView.onDidChangeEditorPartOptions(e => this.onDidChangeEditorPartOptions(e)));
         this._register(this.groupsView.onDidVisibilityChange(e => this.onDidVisibilityChange(e)));
+        this._register(this.onDidFocus(() => this.onDidGainFocus()));
     }
     onDidGroupModelChange(e) {
         this._onDidModelChange.fire(e);
@@ -388,12 +401,15 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
                     this.handleOnDidCloseEditor(e.editor, e.editorIndex, e.context, e.sticky);
                 }
                 break;
-            case 13 :
+            case 14 :
                 this.onWillDisposeEditor(e.editor);
                 break;
-            case 12 :
+            case 13 :
                 this.onDidChangeEditorDirty(e.editor);
                 break;
+            case 11 :
+                this.onDidChangeEditorTransient(e.editor);
+                break;
             case 8 :
                 this.onDidChangeEditorLabel(e.editor);
                 break;
@@ -429,15 +445,33 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         }
         return true;
     }
+    toResourceTelemetryDescriptor(resource) {
+        if (!resource) {
+            return undefined;
+        }
+        const path = resource ? resource.scheme === Schemas.file ? resource.fsPath : resource.path : undefined;
+        if (!path) {
+            return undefined;
+        }
+        let resourceExt = extname(resource);
+        const queryStringLocation = resourceExt.indexOf('?');
+        resourceExt = queryStringLocation !== -1 ? resourceExt.substr(0, queryStringLocation) : resourceExt;
+        return { mimeType: ( new TelemetryTrustedValue(getMimeTypes(resource).join(', '))), scheme: resource.scheme, ext: resourceExt, path: hash(path) };
+    }
     toEditorTelemetryDescriptor(editor) {
         const descriptor = editor.getTelemetryDescriptor();
-        const resource = EditorResourceAccessor.getOriginalUri(editor);
-        const path = resource ? resource.scheme === Schemas.file ? resource.fsPath : resource.path : undefined;
-        if (resource && path) {
-            let resourceExt = extname(resource);
-            const queryStringLocation = resourceExt.indexOf('?');
-            resourceExt = queryStringLocation !== -1 ? resourceExt.substr(0, queryStringLocation) : resourceExt;
-            descriptor['resource'] = { mimeType: ( new TelemetryTrustedValue(getMimeTypes(resource).join(', '))), scheme: resource.scheme, ext: resourceExt, path: hash(path) };
+        const resource = EditorResourceAccessor.getOriginalUri(editor, { supportSideBySide: SideBySideEditor.BOTH });
+        if (URI.isUri(resource)) {
+            descriptor['resource'] = this.toResourceTelemetryDescriptor(resource);
+            return descriptor;
+        }
+        else if (resource) {
+            if (resource.primary) {
+                descriptor['resource'] = this.toResourceTelemetryDescriptor(resource.primary);
+            }
+            if (resource.secondary) {
+                descriptor['resourceSecondary'] = this.toResourceTelemetryDescriptor(resource.secondary);
+            }
             return descriptor;
         }
         return descriptor;
@@ -468,7 +502,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             this.doCloseEditor(inactiveEditor, true);
         }
         if (activeEditor) {
-            this.doCloseEditor(activeEditor);
+            this.doCloseEditor(activeEditor, true);
         }
     }
     onDidChangeEditorPartOptions(event) {
@@ -493,12 +527,23 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         this.pinEditor(editor);
         this.titleControl.updateEditorDirty(editor);
     }
+    onDidChangeEditorTransient(editor) {
+        const transient = this.model.isTransient(editor);
+        if (!transient && !this.groupsView.partOptions.enablePreview) {
+            this.pinEditor(editor);
+        }
+    }
     onDidChangeEditorLabel(editor) {
         this.titleControl.updateEditorLabel(editor);
     }
     onDidVisibilityChange(visible) {
         this.editorPane.setVisible(visible);
     }
+    onDidGainFocus() {
+        if (this.activeEditor) {
+            this.model.setTransient(this.activeEditor, false);
+        }
+    }
     get index() {
         return this._index;
     }
@@ -595,6 +640,9 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     isSticky(editorOrIndex) {
         return this.model.isSticky(editorOrIndex);
     }
+    isTransient(editorOrIndex) {
+        return this.model.isTransient(editorOrIndex);
+    }
     isActive(editor) {
         return this.model.isActive(editor);
     }
@@ -638,7 +686,6 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         return this.model.isLast(editor);
     }
     focus() {
-        focusWindow(this.element);
         if (this.activeEditorPane) {
             this.activeEditorPane.focus();
         }
@@ -692,7 +739,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         }
         this._onWillOpenEditor.fire({ editor, groupId: this.id });
         const pinned = options?.sticky
-            || !this.groupsView.partOptions.enablePreview
+            || (!this.groupsView.partOptions.enablePreview && !options?.transient)
             || editor.isDirty()
             || ((options?.pinned ?? typeof options?.index === 'number') )
             || (typeof options?.index === 'number' && this.model.isSticky(options.index))
@@ -701,6 +748,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
             index: options ? options.index : undefined,
             pinned,
             sticky: options?.sticky || (typeof options?.index === 'number' && this.model.isSticky(options.index)),
+            transient: !!options?.transient,
             active: this.count === 0 || !options || !options.inactive,
             supportSideBySide: internalOptions?.supportSideBySide
         };
@@ -805,21 +853,29 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         const internalOptions = {
             skipTitleUpdate: this !== target
         };
+        let moveFailed = false;
+        const movedEditors = ( new Set());
         for (const { editor, options } of editors) {
-            this.moveEditor(editor, target, options, internalOptions);
+            if (this.moveEditor(editor, target, options, internalOptions)) {
+                movedEditors.add(editor);
+            }
+            else {
+                moveFailed = true;
+            }
         }
         if (internalOptions.skipTitleUpdate) {
-            const movedEditors = ( editors.map(({ editor }) => editor));
-            target.titleControl.openEditors(movedEditors);
-            this.titleControl.closeEditors(movedEditors);
+            target.titleControl.openEditors(Array.from(movedEditors));
+            this.titleControl.closeEditors(Array.from(movedEditors));
         }
+        return !moveFailed;
     }
     moveEditor(editor, target, options, internalOptions) {
         if (this === target) {
             this.doMoveEditorInsideGroup(editor, options);
+            return true;
         }
         else {
-            this.doMoveOrCopyEditorAcrossGroups(editor, target, options, { ...internalOptions, keepCopy: false });
+            return this.doMoveOrCopyEditorAcrossGroups(editor, target, options, { ...internalOptions, keepCopy: false });
         }
     }
     doMoveEditorInsideGroup(candidate, options) {
@@ -845,6 +901,17 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     doMoveOrCopyEditorAcrossGroups(editor, target, openOptions, internalOptions) {
         const keepCopy = internalOptions?.keepCopy;
+        if (!keepCopy || editor.hasCapability(8 ) ) {
+            const canMoveVeto = editor.canMove(this.id, target.id);
+            if (typeof canMoveVeto === 'string') {
+                this.dialogService.error(canMoveVeto, ( localizeWithPath(
+                    'vs/workbench/browser/parts/editor/editorGroupView',
+                    'moveErrorDetails',
+                    "Try saving or reverting the editor first and then try again."
+                )));
+                return false;
+            }
+        }
         const options = fillActiveEditorViewState(this, editor, {
             ...openOptions,
             pinned: true,
@@ -861,6 +928,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         if (!keepCopy) {
             this.doCloseEditor(editor, true , { ...internalOptions, context: EditorCloseContext.MOVE });
         }
+        return true;
     }
     copyEditors(editors, target) {
         const internalOptions = {
@@ -1308,6 +1376,7 @@ EditorGroupView = EditorGroupView_1 = ( __decorate([
     ( __param(15, IUriIdentityService)),
     ( __param(16, ILogService)),
     ( __param(17, IEditorResolverService)),
-    ( __param(18, IHostService))
+    ( __param(18, IHostService)),
+    ( __param(19, IDialogService))
 ], EditorGroupView));
 export { EditorGroupView };

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

@@ -10,7 +10,17 @@ import { KeybindingLabel } from '../../../../base/browser/ui/keybindingLabel/key
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { IContextKeyService, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { registerColor, transparent, editorForeground } from '../../../../platform/theme/common/colorRegistry.js';
+import { registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorForeground } 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';
 registerColor('editorWatermark.foreground', { dark: ( transparent(editorForeground, 0.6)), light: ( transparent(editorForeground, 0.68)), hcDark: editorForeground, hcLight: editorForeground }, ( localizeWithPath(
     'vs/workbench/browser/parts/editor/editorGroupWatermark',
     'editorLineHighlight',
@@ -162,12 +172,13 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
                 const dt = append(dl, $('dt'));
                 dt.textContent = entry.text;
                 const dd = append(dl, $('dd'));
-                const keybinding = ( new KeybindingLabel(
+                this.keybindingLabel?.dispose();
+                this.keybindingLabel = ( new KeybindingLabel(
                     dd,
                     OS,
                     { renderUnboundKeybindings: true, ...defaultKeybindingLabelStyles }
                 ));
-                keybinding.set(keys);
+                this.keybindingLabel.set(keys);
             }
         };
         update();
@@ -180,6 +191,7 @@ let EditorGroupWatermark = class EditorGroupWatermark extends Disposable {
     dispose() {
         super.dispose();
         this.clear();
+        this.keybindingLabel?.dispose();
     }
 };
 EditorGroupWatermark = ( __decorate([

package/vscode/src/vs/workbench/browser/parts/editor/editorPane.d.ts

@@ -1,3 +1,4 @@
+import { CodeWindow } from '../../../../base/browser/window.js';
 import { Composite } from '../../composite.js';
 import { IEditorPane, IEditorOpenContext, IEditorMemento } from '../../../common/editor.js';
 import { EditorInput } from '../../../common/editor/editorInput.js';
@@ -34,6 +35,7 @@ import { IBoundarySashes } from '../../../../base/browser/ui/sash/sash.js';
  * This class is only intended to be subclassed and not instantiated.
  */
 declare abstract class EditorPane extends Composite implements IEditorPane {
+    readonly group: IEditorGroup;
     readonly onDidChangeSizeConstraints: Event<any>;
     protected readonly _onDidChangeControl: Emitter<void>;
     readonly onDidChangeControl: Event<void>;
@@ -46,13 +48,12 @@ declare abstract class EditorPane extends Composite implements IEditorPane {
     get input(): EditorInput | undefined;
     protected _options: IEditorOptions | undefined;
     get options(): IEditorOptions | undefined;
-    private _group;
-    get group(): IEditorGroup | undefined;
+    get window(): CodeWindow;
     /**
      * Should be overridden by editors that have their own ScopedContextKeyService
      */
     get scopedContextKeyService(): IContextKeyService | undefined;
-    constructor(id: string, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService);
+    constructor(id: string, group: IEditorGroup, telemetryService: ITelemetryService, themeService: IThemeService, storageService: IStorageService);
     create(parent: HTMLElement): void;
     /**
      * Called to create the editor in the parent HTMLElement. Subclasses implement
@@ -93,15 +94,13 @@ declare abstract class EditorPane extends Composite implements IEditorPane {
      * to the current input.
      */
     setOptions(options: IEditorOptions | undefined): void;
-    setVisible(visible: boolean, group?: IEditorGroup): void;
+    setVisible(visible: boolean): void;
     /**
-     * Indicates that the editor control got visible or hidden in a specific group. A
-     * editor instance will only ever be visible in one editor group.
+     * Indicates that the editor control got visible or hidden.
      *
      * @param visible the state of visibility of this editor
-     * @param group the editor group this editor is in.
      */
-    protected setEditorVisible(visible: boolean, group: IEditorGroup | undefined): void;
+    protected setEditorVisible(visible: boolean): void;
     setBoundarySashes(_sashes: IBoundarySashes): void;
     protected getEditorMemento<T>(editorGroupService: IEditorGroupsService, configurationService: ITextResourceConfigurationService, key: string, limit?: number): IEditorMemento<T>;
     getViewState(): object | undefined;