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

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

@@ -1,4 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { onDidChangeZoomLevel, onDidChangeFullscreen, isFullscreen } from 'vscode/vscode/vs/base/browser/browser';
 import { show, hide } from 'vscode/vscode/vs/base/browser/dom';
 import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -9,7 +10,7 @@ import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/c
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
-import { getTitleBarStyle } from 'vscode/vscode/vs/platform/window/common/window';
+import { hasNativeTitlebar } from 'vscode/vscode/vs/platform/window/common/window';
 import { EditorPart } from './editorPart.js';
 import { WindowTitle } from 'vscode/vscode/vs/workbench/browser/parts/titlebar/windowTitle';
 import { IAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
@@ -40,7 +41,7 @@ let AuxiliaryEditorPart = class AuxiliaryEditorPart {
             if (statusBarVisible) {
                 editorPartHeightOffset += statusbarPart.height;
             }
-            if (titlebarPart) {
+            if (titlebarPart && titlebarPartVisible) {
                 editorPartHeightOffset += titlebarPart.height;
             }
             return editorPartHeightOffset;
@@ -67,14 +68,33 @@ let AuxiliaryEditorPart = class AuxiliaryEditorPart {
         editorPartContainer.setAttribute('role', 'main');
         editorPartContainer.style.position = 'relative';
         auxiliaryWindow.container.appendChild(editorPartContainer);
-        const editorPart = disposables.add(this.instantiationService.createInstance(AuxiliaryEditorPartImpl, auxiliaryWindow.window.vscodeWindowId, this.editorPartsView, label));
+        const editorPart = disposables.add(this.instantiationService.createInstance(AuxiliaryEditorPartImpl, auxiliaryWindow.window.vscodeWindowId, this.editorPartsView, options?.state, label));
         disposables.add(this.editorPartsView.registerPart(editorPart));
-        editorPart.create(editorPartContainer, { restorePreviousState: false });
+        editorPart.create(editorPartContainer);
         let titlebarPart = undefined;
-        const useCustomTitle = isNative && getTitleBarStyle(this.configurationService) === 'custom';
+        let titlebarPartVisible = false;
+        const useCustomTitle = isNative && !hasNativeTitlebar(this.configurationService);
         if (useCustomTitle) {
             titlebarPart = disposables.add(this.titleService.createAuxiliaryTitlebarPart(auxiliaryWindow.container, editorPart));
+            titlebarPartVisible = true;
             disposables.add(titlebarPart.onDidChange(() => updateEditorPartHeight(true)));
+            disposables.add(onDidChangeZoomLevel(targetWindowId => {
+                if (auxiliaryWindow.window.vscodeWindowId === targetWindowId && titlebarPartVisible) {
+                    updateEditorPartHeight(true);
+                }
+            }));
+            disposables.add(onDidChangeFullscreen(windowId => {
+                if (windowId !== auxiliaryWindow.window.vscodeWindowId) {
+                    return;
+                }
+                const fullscreen = isFullscreen(auxiliaryWindow.window);
+                const oldTitlebarPartVisible = titlebarPartVisible;
+                titlebarPartVisible = !fullscreen;
+                if (titlebarPart && oldTitlebarPartVisible !== titlebarPartVisible) {
+                    titlebarPart.container.style.display = titlebarPartVisible ? '' : 'none';
+                    updateEditorPartHeight(true);
+                }
+            }));
         }
         else {
             disposables.add(this.instantiationService.createInstance(WindowTitle, auxiliaryWindow.window, editorPart));
@@ -89,7 +109,7 @@ let AuxiliaryEditorPart = class AuxiliaryEditorPart {
         }));
         updateStatusbarVisibility(false);
         const editorCloseListener = disposables.add(Event.once(editorPart.onWillClose)(() => auxiliaryWindow.window.close()));
-        disposables.add(Event.once(auxiliaryWindow.onWillClose)(() => {
+        disposables.add(Event.once(auxiliaryWindow.onUnload)(() => {
             if (disposables.isDisposed) {
                 return;
             }
@@ -100,9 +120,7 @@ let AuxiliaryEditorPart = class AuxiliaryEditorPart {
         disposables.add(Event.once(this.lifecycleService.onDidShutdown)(() => disposables.dispose()));
         disposables.add(auxiliaryWindow.onDidLayout(dimension => {
             const titlebarPartHeight = titlebarPart?.height ?? 0;
-            if (titlebarPart) {
-                titlebarPart.layout(dimension.width, titlebarPartHeight, 0, 0);
-            }
+            titlebarPart?.layout(dimension.width, titlebarPartHeight, 0, 0);
             const editorPartHeight = dimension.height - computeEditorPartHeightOffset();
             editorPart.layout(dimension.width, editorPartHeight, titlebarPartHeight, 0);
             statusbarPart.layout(dimension.width, statusbarPart.height, dimension.height - statusbarPart.height, 0);
@@ -131,10 +149,10 @@ AuxiliaryEditorPart = AuxiliaryEditorPart_1 = ( __decorate([
 let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
     static { AuxiliaryEditorPartImpl_1 = this; }
     static { this.COUNTER = 1; }
-    constructor(windowId, editorPartsView, groupsLabel, instantiationService, themeService, configurationService, storageService, layoutService, hostService, contextKeyService) {
+    constructor(windowId, editorPartsView, state, groupsLabel, instantiationService, themeService, configurationService, storageService, layoutService, hostService, contextKeyService) {
         const id = AuxiliaryEditorPartImpl_1.COUNTER++;
-        super(editorPartsView, `workbench.parts.auxiliaryEditor.${id}`, groupsLabel, true, instantiationService, themeService, configurationService, storageService, layoutService, hostService, contextKeyService);
-        this.windowId = windowId;
+        super(editorPartsView, `workbench.parts.auxiliaryEditor.${id}`, groupsLabel, windowId, instantiationService, themeService, configurationService, storageService, layoutService, hostService, contextKeyService);
+        this.state = state;
         this._onWillClose = this._register(( new Emitter()));
         this.onWillClose = this._onWillClose.event;
     }
@@ -159,6 +177,9 @@ let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
         }
         this.doClose(false );
     }
+    loadState() {
+        return this.state;
+    }
     saveState() {
         return;
     }
@@ -166,20 +187,37 @@ let AuxiliaryEditorPartImpl = class AuxiliaryEditorPartImpl extends EditorPart {
         this.doClose(true );
     }
     doClose(mergeGroupsToMainPart) {
-        if (mergeGroupsToMainPart && ( this.groups.some(group => group.count > 0))) {
-            this.mergeAllGroups(this.editorPartsView.mainPart.activeGroup);
+        if (mergeGroupsToMainPart) {
+            this.mergeGroupsToMainPart();
         }
         this._onWillClose.fire();
     }
+    mergeGroupsToMainPart() {
+        if (!( this.groups.some(group => group.count > 0))) {
+            return;
+        }
+        let targetGroup = undefined;
+        for (const group of this.editorPartsView.mainPart.getGroups(1 )) {
+            if (!group.isLocked) {
+                targetGroup = group;
+                break;
+            }
+        }
+        if (!targetGroup) {
+            targetGroup = this.editorPartsView.mainPart.addGroup(this.editorPartsView.mainPart.activeGroup, this.partOptions.openSideBySideDirection === 'right' ? 3  : 1 );
+        }
+        this.mergeAllGroups(targetGroup);
+        targetGroup.focus();
+    }
 };
 AuxiliaryEditorPartImpl = AuxiliaryEditorPartImpl_1 = ( __decorate([
-    ( __param(3, IInstantiationService)),
-    ( __param(4, IThemeService)),
-    ( __param(5, IConfigurationService)),
-    ( __param(6, IStorageService)),
-    ( __param(7, IWorkbenchLayoutService)),
-    ( __param(8, IHostService)),
-    ( __param(9, IContextKeyService))
+    ( __param(4, IInstantiationService)),
+    ( __param(5, IThemeService)),
+    ( __param(6, IConfigurationService)),
+    ( __param(7, IStorageService)),
+    ( __param(8, IWorkbenchLayoutService)),
+    ( __param(9, IHostService)),
+    ( __param(10, IContextKeyService))
 ], AuxiliaryEditorPartImpl));
 
 export { AuxiliaryEditorPart };

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

@@ -1,8 +1,8 @@
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor';
 import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
-import { IsAuxiliaryEditorPartContext, ActiveEditorGroupLockedContext, MultipleEditorGroupsContext, InEditorZenModeContext, EditorGroupEditorsCountContext, ActiveEditorLastInGroupContext, EditorTabsVisibleContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorPinnedContext, ActiveEditorStickyContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, EditorPartMaximizedEditorGroupContext, EditorPartMultipleEditorGroupsContext, ActiveEditorDirtyContext, TextCompareEditorActiveContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { IsAuxiliaryEditorPartContext, ActiveEditorGroupLockedContext, EditorPartMultipleEditorGroupsContext, MultipleEditorGroupsContext, InEditorZenModeContext, EditorGroupEditorsCountContext, ActiveEditorLastInGroupContext, EditorTabsVisibleContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorPinnedContext, ActiveEditorStickyContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, EditorPartMaximizedEditorGroupContext, ActiveEditorDirtyContext, TextCompareEditorActiveContext, ActiveCompareEditorOriginalWriteableContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
 import { SideBySideEditorInput, SideBySideEditorInputSerializer } from 'vscode/vscode/vs/workbench/common/editor/sideBySideEditorInput';
 import { TextResourceEditor } from 'vscode/vscode/vs/workbench/browser/parts/editor/textResourceEditor';
 import { SideBySideEditor } from 'vscode/vscode/vs/workbench/browser/parts/editor/sideBySideEditor';
@@ -16,7 +16,7 @@ import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommon
 import { registerAction2, MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { ShowEditorsInActiveGroupByMostRecentlyUsedAction, ShowAllEditorsByAppearanceAction, ShowAllEditorsByMostRecentlyUsedAction, NavigateForwardAction, NavigateBackwardsAction, OpenNextEditor, OpenPreviousEditor, OpenNextEditorInGroup, OpenPreviousEditorInGroup, OpenFirstEditorInGroup, OpenLastEditorInGroup, OpenNextRecentlyUsedEditorAction, OpenPreviousRecentlyUsedEditorAction, OpenNextRecentlyUsedEditorInGroupAction, OpenPreviousRecentlyUsedEditorInGroupAction, ReopenClosedEditorAction, ClearRecentFilesAction, 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, EditorLayoutSingleAction, EditorLayoutTwoColumnsAction, EditorLayoutThreeColumnsAction, EditorLayoutTwoRowsAction, EditorLayoutThreeRowsAction, EditorLayoutTwoByTwoGridAction, EditorLayoutTwoRowsRightAction, EditorLayoutTwoColumnsBottomAction, ToggleEditorTypeAction, ReOpenInTextEditorAction, QuickAccessPreviousRecentlyUsedEditorAction, QuickAccessLeastRecentlyUsedEditorAction, QuickAccessPreviousRecentlyUsedEditorInGroupAction, QuickAccessLeastRecentlyUsedEditorInGroupAction, QuickAccessPreviousEditorFromHistoryAction, MoveEditorToNewWindowAction, CopyEditorToNewindowAction, MoveEditorGroupToNewWindowAction, CopyEditorGroupToNewWindowAction, RestoreEditorsToMainWindowAction, NewEmptyEditorWindowAction } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorActions';
-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, SPLIT_EDITOR, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, GOTO_PREVIOUS_CHANGE, GOTO_NEXT_CHANGE, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_SECOND_SIDE_EDITOR } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
+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, SPLIT_EDITOR, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, GOTO_PREVIOUS_CHANGE, GOTO_NEXT_CHANGE, DIFF_SWAP_SIDES, TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_SECOND_SIDE_EDITOR } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
 import { inQuickPickContext, getQuickNavigateHandler } from 'vscode/vscode/vs/workbench/browser/quickaccess';
 import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
@@ -29,7 +29,7 @@ import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 import { UntitledTextEditorInputSerializer, UntitledTextEditorWorkingCopyEditorHandler } from '../../../services/untitled/common/untitledTextEditorHandler.js';
 import { DynamicEditorConfigurations } from './editorConfiguration.js';
-import { ShowMultipleEditorTabsAction, ShowSingleEditorTabAction, HideEditorTabsAction, EditorActionsDefaultAction, EditorActionsTitleBarAction, HideEditorActionsAction } from 'vscode/vscode/vs/workbench/browser/actions/layoutActions';
+import { ShowMultipleEditorTabsAction, ShowSingleEditorTabAction, HideEditorTabsAction, ZenShowMultipleEditorTabsAction, ZenShowSingleEditorTabAction, ZenHideEditorTabsAction, EditorActionsDefaultAction, EditorActionsTitleBarAction, HideEditorActionsAction } from 'vscode/vscode/vs/workbench/browser/actions/layoutActions';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import 'vscode/vscode/vs/workbench/browser/parts/editor/editor.autosave.contribution';
 
@@ -261,7 +261,7 @@ MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroup, { command: { id: CLOSE_EDIT
     'vs/workbench/browser/parts/editor/editor.contribution',
     'closeGroupAction',
     "Close Group"
-)), icon: Codicon.close }, group: 'navigation', order: 20 });
+)), icon: Codicon.close }, group: 'navigation', order: 20, when: ( ContextKeyExpr.or(IsAuxiliaryEditorPartContext, EditorPartMultipleEditorGroupsContext)) });
 MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: SPLIT_EDITOR_UP, title: ( localizeWithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'splitUp',
@@ -291,7 +291,7 @@ MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: TOG
     'vs/workbench/browser/parts/editor/editor.contribution',
     'toggleLockGroup',
     "Lock Group"
-)), toggled: ActiveEditorGroupLockedContext }, group: '4_lock', order: 10, when: ( ContextKeyExpr.and(MultipleEditorGroupsContext, ( IsAuxiliaryEditorPartContext.toNegated()))) });
+)), toggled: ActiveEditorGroupLockedContext }, group: '4_lock', order: 10, when: ( IsAuxiliaryEditorPartContext.toNegated())  });
 MenuRegistry.appendMenuItem(MenuId.EmptyEditorGroupContext, { command: { id: CLOSE_EDITOR_GROUP_COMMAND_ID, title: ( localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'close', "Close")) }, group: '5_close', order: 10, when: MultipleEditorGroupsContext });
 MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { command: { id: SPLIT_EDITOR_UP, title: ( localizeWithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
@@ -343,6 +343,26 @@ MenuRegistry.appendMenuItem(MenuId.EditorTabsBarShowTabsSubmenu, { command: { id
     'hideTabs',
     "Hidden"
 )), toggled: ( ContextKeyExpr.equals('config.workbench.editor.showTabs', 'none')) }, group: '1_config', order: 30 });
+MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { submenu: MenuId.EditorTabsBarShowTabsZenModeSubmenu, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'tabBar',
+    "Tab Bar"
+)), group: '4_config', order: 10, when: InEditorZenModeContext });
+MenuRegistry.appendMenuItem(MenuId.EditorTabsBarShowTabsZenModeSubmenu, { command: { id: ZenShowMultipleEditorTabsAction.ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'multipleTabs',
+    "Multiple Tabs"
+)), toggled: ( ContextKeyExpr.equals('config.zenMode.showTabs', 'multiple')) }, group: '1_config', order: 10 });
+MenuRegistry.appendMenuItem(MenuId.EditorTabsBarShowTabsZenModeSubmenu, { command: { id: ZenShowSingleEditorTabAction.ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'singleTab',
+    "Single Tab"
+)), toggled: ( ContextKeyExpr.equals('config.zenMode.showTabs', 'single')) }, group: '1_config', order: 20 });
+MenuRegistry.appendMenuItem(MenuId.EditorTabsBarShowTabsZenModeSubmenu, { command: { id: ZenHideEditorTabsAction.ID, title: ( localizeWithPath(
+    'vs/workbench/browser/parts/editor/editor.contribution',
+    'hideTabs',
+    "Hidden"
+)), toggled: ( ContextKeyExpr.equals('config.zenMode.showTabs', 'none')) }, group: '1_config', order: 30 });
 MenuRegistry.appendMenuItem(MenuId.EditorTabsBarContext, { submenu: MenuId.EditorActionsPositionSubmenu, title: ( localizeWithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'editorActionsPosition',
@@ -357,12 +377,12 @@ MenuRegistry.appendMenuItem(MenuId.EditorActionsPositionSubmenu, { command: { id
     'vs/workbench/browser/parts/editor/editor.contribution',
     'titleBar',
     "Title Bar"
-)), toggled: ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'titleBar')), ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.workbench.editor.showTabs', 'none')), ( ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'default')))))) }, group: '1_config', order: 20, when: ( ( ContextKeyExpr.equals('config.window.titleBarStyle', 'native')).negate()) });
+)), toggled: ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'titleBar')), ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.workbench.editor.showTabs', 'none')), ( ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'default')))))) }, group: '1_config', order: 20 });
 MenuRegistry.appendMenuItem(MenuId.EditorActionsPositionSubmenu, { command: { id: HideEditorActionsAction.ID, title: ( localizeWithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'hidden',
     "Hidden"
-)), toggled: ( ContextKeyExpr.or(( ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'hidden')), ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.window.titleBarStyle', 'native')), ( ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'titleBar')))))) }, group: '1_config', order: 30 });
+)), toggled: ( ContextKeyExpr.equals('config.workbench.editor.editorActionsLocation', 'hidden')) }, group: '1_config', order: 30 });
 MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: CLOSE_EDITOR_COMMAND_ID, title: ( localizeWithPath('vs/workbench/browser/parts/editor/editor.contribution', 'close', "Close")) }, group: '1_close', order: 10 });
 MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, title: ( localizeWithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
@@ -420,22 +440,22 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: SPLIT_ED
     'vs/workbench/browser/parts/editor/editor.contribution',
     'splitInGroup',
     "Split in Group"
-)) }, group: '5_split', order: 50, when: ActiveEditorCanSplitInGroupContext });
+)) }, group: '6_split_in_group', order: 10, when: ActiveEditorCanSplitInGroupContext });
 MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: JOIN_EDITOR_IN_GROUP, title: ( localizeWithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'joinInGroup',
     "Join in Group"
-)) }, group: '5_split', order: 50, when: SideBySideEditorActiveContext });
+)) }, group: '6_split_in_group', order: 10, when: SideBySideEditorActiveContext });
 MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, title: ( localizeWithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'moveToNewWindow',
     "Move into New Window"
-)) }, group: '6_new_window', order: 10 });
+)) }, group: '7_new_window', order: 10 });
 MenuRegistry.appendMenuItem(MenuId.EditorTitleContext, { command: { id: COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, title: ( localizeWithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'copyToNewWindow',
     "Copy into New Window"
-)) }, group: '6_new_window', order: 20 });
+)) }, group: '7_new_window', order: 20 });
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_DIFF_SIDE_BY_SIDE, title: ( localizeWithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'inlineView',
@@ -475,7 +495,7 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, { command: { id: TOGGLE_LOCK_GRO
     'vs/workbench/browser/parts/editor/editor.contribution',
     'lockGroup',
     "Lock Group"
-)), toggled: ActiveEditorGroupLockedContext }, group: '8_group_operations', order: 10, when: ( ContextKeyExpr.and(MultipleEditorGroupsContext, ( IsAuxiliaryEditorPartContext.toNegated()))) });
+)), toggled: ActiveEditorGroupLockedContext }, group: '8_group_operations', order: 10, when: ( IsAuxiliaryEditorPartContext.toNegated())  });
 function appendEditorToolItem(primary, when, order, alternative, precondition) {
     const item = {
         command: {
@@ -639,6 +659,18 @@ appendEditorToolItem({
     )),
     icon: nextChangeIcon
 }, TextCompareEditorActiveContext, 11, undefined, EditorContextKeys.hasChanges);
+appendEditorToolItem({
+    id: DIFF_SWAP_SIDES,
+    title: ( localizeWithPath(
+        'vs/workbench/browser/parts/editor/editor.contribution',
+        'swapDiffSides',
+        "Swap Left and Right Side"
+    )),
+    icon: Codicon.arrowSwap
+}, ( ContextKeyExpr.and(
+    TextCompareEditorActiveContext,
+    ActiveCompareEditorOriginalWriteableContext
+)), 15, undefined, undefined);
 MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     command: {
         id: TOGGLE_DIFF_IGNORE_TRIM_WHITESPACE,
@@ -655,61 +687,61 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
     when: TextCompareEditorActiveContext,
     order: 20,
 });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: KEEP_EDITOR_COMMAND_ID, title: { value: ( localizeWithPath(
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: KEEP_EDITOR_COMMAND_ID, title: ( localize2WithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'keepEditor',
-    "Keep Editor"
-)), original: 'Keep Editor' }, category: Categories.View }, when: ( ContextKeyExpr.has('config.workbench.editor.enablePreview')) });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: PIN_EDITOR_COMMAND_ID, title: { value: ( localizeWithPath(
+    'Keep Editor'
+)), category: Categories.View }, when: ( ContextKeyExpr.has('config.workbench.editor.enablePreview')) });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: PIN_EDITOR_COMMAND_ID, title: ( localize2WithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'pinEditor',
-    "Pin Editor"
-)), original: 'Pin Editor' }, category: Categories.View } });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: UNPIN_EDITOR_COMMAND_ID, title: { value: ( localizeWithPath(
+    'Pin Editor'
+)), category: Categories.View } });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: UNPIN_EDITOR_COMMAND_ID, title: ( localize2WithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'unpinEditor',
-    "Unpin Editor"
-)), original: 'Unpin Editor' }, category: Categories.View } });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITOR_COMMAND_ID, title: { value: ( localizeWithPath(
+    'Unpin Editor'
+)), category: Categories.View } });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITOR_COMMAND_ID, title: ( localize2WithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'closeEditor',
-    "Close Editor"
-)), original: 'Close Editor' }, category: Categories.View } });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_PINNED_EDITOR_COMMAND_ID, title: { value: ( localizeWithPath(
+    'Close Editor'
+)), category: Categories.View } });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_PINNED_EDITOR_COMMAND_ID, title: ( localize2WithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'closePinnedEditor',
-    "Close Pinned Editor"
-)), original: 'Close Pinned Editor' }, category: Categories.View } });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID, title: { value: ( localizeWithPath(
+    'Close Pinned Editor'
+)), category: Categories.View } });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITORS_IN_GROUP_COMMAND_ID, title: ( localize2WithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'closeEditorsInGroup',
-    "Close All Editors in Group"
-)), original: 'Close All Editors in Group' }, category: Categories.View } });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_SAVED_EDITORS_COMMAND_ID, title: { value: ( localizeWithPath(
+    'Close All Editors in Group'
+)), category: Categories.View } });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_SAVED_EDITORS_COMMAND_ID, title: ( localize2WithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'closeSavedEditors',
-    "Close Saved Editors in Group"
-)), original: 'Close Saved Editors in Group' }, category: Categories.View } });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, title: { value: ( localizeWithPath(
+    'Close Saved Editors in Group'
+)), category: Categories.View } });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, title: ( localize2WithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'closeOtherEditors',
-    "Close Other Editors in Group"
-)), original: 'Close Other Editors in Group' }, category: Categories.View } });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, title: { value: ( localizeWithPath(
+    'Close Other Editors in Group'
+)), category: Categories.View } });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, title: ( localize2WithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'closeRightEditors',
-    "Close Editors to the Right in Group"
-)), original: 'Close Editors to the Right in Group' }, category: Categories.View }, when: ( ActiveEditorLastInGroupContext.toNegated()) });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITORS_AND_GROUP_COMMAND_ID, title: { value: ( localizeWithPath(
+    'Close Editors to the Right in Group'
+)), category: Categories.View }, when: ( ActiveEditorLastInGroupContext.toNegated()) });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: CLOSE_EDITORS_AND_GROUP_COMMAND_ID, title: ( localize2WithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'closeEditorGroup',
-    "Close Editor Group"
-)), original: 'Close Editor Group' }, category: Categories.View }, when: MultipleEditorGroupsContext });
-MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: REOPEN_WITH_COMMAND_ID, title: { value: ( localizeWithPath(
+    'Close Editor Group'
+)), category: Categories.View }, when: MultipleEditorGroupsContext });
+MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: { id: REOPEN_WITH_COMMAND_ID, title: ( localize2WithPath(
     'vs/workbench/browser/parts/editor/editor.contribution',
     'reopenWith',
     "Reopen Editor With..."
-)), original: 'Reopen Editor With...' }, category: Categories.View }, when: ActiveEditorAvailableEditorIdsContext });
+)), category: Categories.View }, when: ActiveEditorAvailableEditorIdsContext });
 MenuRegistry.appendMenuItem(MenuId.MenubarRecentMenu, {
     group: '1_editor',
     command: {

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

@@ -14,7 +14,11 @@ import { getLargeFileConfirmationLimit, ByteSize } from 'vscode/vscode/vs/platfo
 var DynamicEditorConfigurations_1;
 let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disposable {
     static { DynamicEditorConfigurations_1 = this; }
-    static { this.AUTO_LOCK_DEFAULT_ENABLED = ( new Set(['terminalEditor'])); }
+    static { this.AUTO_LOCK_DEFAULT_ENABLED = ( new Set([
+        'terminalEditor',
+        'mainThreadWebview-simpleBrowser.view',
+        'mainThreadWebview-browserPreview'
+    ])); }
     static { this.AUTO_LOCK_EXTRA_EDITORS = [
         {
             id: 'workbench.input.interactive',
@@ -33,6 +37,24 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 "Markdown Preview"
             )),
             priority: RegisteredEditorPriority.builtin
+        },
+        {
+            id: 'mainThreadWebview-simpleBrowser.view',
+            label: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editorConfiguration',
+                'simpleBrowser',
+                "Simple Browser"
+            )),
+            priority: RegisteredEditorPriority.builtin
+        },
+        {
+            id: 'mainThreadWebview-browserPreview',
+            label: ( localizeWithPath(
+                'vs/workbench/browser/parts/editor/editorConfiguration',
+                'livePreview',
+                "Live Preview"
+            )),
+            priority: RegisteredEditorPriority.builtin
         }
     ]; }
     static { this.AUTO_LOCK_REMOVE_EDITORS = ( new Set([