@codingame/monaco-vscode-api 31.0.1 → 32.0.0

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

@@ -271,12 +271,12 @@ class StatusInputMode extends Disposable {
         );
     }
 }
-const nlsSingleSelectionRange = ( localize(3510, "Ln {0}, Col {1} ({2} selected)"));
-const nlsSingleSelection = ( localize(3511, "Ln {0}, Col {1}"));
-const nlsMultiSelectionRange = ( localize(3512, "{0} selections ({1} characters selected)"));
-const nlsMultiSelection = ( localize(3513, "{0} selections"));
-const nlsEOLLF = ( localize(3514, "LF"));
-const nlsEOLCRLF = ( localize(3515, "CRLF"));
+const nlsSingleSelectionRange = ( localize(3553, "Ln {0}, Col {1} ({2} selected)"));
+const nlsSingleSelection = ( localize(3554, "Ln {0}, Col {1}"));
+const nlsMultiSelectionRange = ( localize(3555, "{0} selections ({1} characters selected)"));
+const nlsMultiSelection = ( localize(3556, "{0} selections"));
+const nlsEOLLF = ( localize(3557, "LF"));
+const nlsEOLCRLF = ( localize(3558, "CRLF"));
 let EditorStatus = class EditorStatus extends Disposable {
     constructor(
         targetWindowId,
@@ -347,12 +347,12 @@ let EditorStatus = class EditorStatus extends Disposable {
         const activeTextEditorControl = getCodeEditor(this.editorService.activeTextEditorControl);
         if (!activeTextEditorControl) {
             return this.quickInputService.pick([{
-                label: ( localize(3516, "No text editor active at this time"))
+                label: ( localize(3559, "No text editor active at this time"))
             }]);
         }
         if (this.editorService.activeEditor?.isReadonly()) {
             return this.quickInputService.pick([{
-                label: ( localize(3517, "The active code editor is read-only."))
+                label: ( localize(3560, "The active code editor is read-only."))
             }]);
         }
         const picks = ( [
@@ -376,14 +376,14 @@ let EditorStatus = class EditorStatus extends Disposable {
         }));
         picks.splice(3, 0, {
             type: "separator",
-            label: ( localize(3518, "convert file"))
+            label: ( localize(3561, "convert file"))
         });
         picks.unshift({
             type: "separator",
-            label: ( localize(3519, "change view"))
+            label: ( localize(3562, "change view"))
         });
         const action = await this.quickInputService.pick(picks, {
-            placeHolder: ( localize(3520, "Select Action")),
+            placeHolder: ( localize(3563, "Select Action")),
             matchOnDetail: true
         });
         return action?.run();
@@ -391,12 +391,12 @@ let EditorStatus = class EditorStatus extends Disposable {
     updateTabFocusModeElement(visible) {
         if (visible) {
             if (!this.tabFocusModeElement.value) {
-                const text = ( localize(3521, "Tab Moves Focus"));
+                const text = ( localize(3564, "Tab Moves Focus"));
                 this.tabFocusModeElement.value = this.statusbarService.addEntry({
-                    name: ( localize(3522, "Accessibility Mode")),
+                    name: ( localize(3565, "Accessibility Mode")),
                     text,
                     ariaLabel: text,
-                    tooltip: ( localize(3523, "Disable Accessibility Mode")),
+                    tooltip: ( localize(3566, "Disable Accessibility Mode")),
                     command: "editor.action.toggleTabFocusMode",
                     kind: "prominent"
                 }, "status.editor.tabFocusMode", StatusbarAlignment.RIGHT, 100.7);
@@ -408,8 +408,8 @@ let EditorStatus = class EditorStatus extends Disposable {
     updateInputModeElement(inputMode) {
         if (inputMode === "overtype") {
             if (!this.inputModeElement.value) {
-                const text = ( localize(3524, "OVR"));
-                const name = ( localize(3525, "Enable Insert Mode"));
+                const text = ( localize(3567, "OVR"));
+                const name = ( localize(3568, "Enable Insert Mode"));
                 this.inputModeElement.value = this.statusbarService.addEntry({
                     name,
                     text,
@@ -426,12 +426,12 @@ let EditorStatus = class EditorStatus extends Disposable {
     updateColumnSelectionModeElement(visible) {
         if (visible) {
             if (!this.columnSelectionModeElement.value) {
-                const text = ( localize(3526, "Column Selection"));
+                const text = ( localize(3569, "Column Selection"));
                 this.columnSelectionModeElement.value = this.statusbarService.addEntry({
-                    name: ( localize(3527, "Column Selection Mode")),
+                    name: ( localize(3570, "Column Selection Mode")),
                     text,
                     ariaLabel: text,
-                    tooltip: ( localize(3528, "Disable Column Selection Mode")),
+                    tooltip: ( localize(3571, "Disable Column Selection Mode")),
                     command: "editor.action.toggleColumnSelection",
                     kind: "prominent"
                 }, "status.editor.columnSelectionMode", StatusbarAlignment.RIGHT, 100.8);
@@ -451,10 +451,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(3529, "Editor Selection")),
+            name: ( localize(3572, "Editor Selection")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3530, "Go to Line/Column")),
+            tooltip: ( localize(3573, "Go to Line/Column")),
             command: "workbench.action.gotoLine"
         };
         this.updateElement(
@@ -476,10 +476,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(3531, "Editor Indentation")),
+            name: ( localize(3574, "Editor Indentation")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3532, "Select Indentation")),
+            tooltip: ( localize(3575, "Select Indentation")),
             command: `changeEditorIndentation${this.targetWindowId}`
         };
         this.updateElement(
@@ -496,10 +496,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(3533, "Editor Encoding")),
+            name: ( localize(3576, "Editor Encoding")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3534, "Select Encoding")),
+            tooltip: ( localize(3577, "Select Encoding")),
             command: "workbench.action.editor.changeEncoding"
         };
         this.updateElement(
@@ -516,10 +516,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(3535, "Editor End of Line")),
+            name: ( localize(3578, "Editor End of Line")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3536, "Select End of Line Sequence")),
+            tooltip: ( localize(3579, "Select End of Line Sequence")),
             command: "workbench.action.editor.changeEOL"
         };
         this.updateElement(
@@ -536,10 +536,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(3537, "Editor Language")),
+            name: ( localize(3580, "Editor Language")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3538, "Select Language Mode")),
+            tooltip: ( localize(3581, "Select Language Mode")),
             command: "workbench.action.editor.changeLanguageMode"
         };
         this.updateElement(
@@ -556,10 +556,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(3539, "File Information")),
+            name: ( localize(3582, "File Information")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3540, "File Information"))
+            tooltip: ( localize(3583, "File Information"))
         };
         this.updateElement(
             this.metadataElement,
@@ -732,12 +732,12 @@ let EditorStatus = class EditorStatus extends Disposable {
             const model = editorWidget.getModel();
             if (model) {
                 const modelOpts = model.getOptions();
-                update.indentation = (modelOpts.insertSpaces ? modelOpts.tabSize === modelOpts.indentSize ? ( localize(3541, "Spaces: {0}", modelOpts.indentSize)) : ( localize(
-                    3542,
+                update.indentation = (modelOpts.insertSpaces ? modelOpts.tabSize === modelOpts.indentSize ? ( localize(3584, "Spaces: {0}", modelOpts.indentSize)) : ( localize(
+                    3585,
                     "Spaces: {0} (Tab Size: {1})",
                     modelOpts.indentSize,
                     modelOpts.tabSize
-                )) : ( localize(3543, "Tab Size: {0}", modelOpts.tabSize)));
+                )) : ( localize(3586, "Tab Size: {0}", modelOpts.tabSize)));
             }
         }
         this.updateState(update);
@@ -913,13 +913,13 @@ let ShowCurrentMarkerInStatusbarContribution = class ShowCurrentMarkerInStatusba
                 const text = `${this.getType(this.currentMarker)} ${line}`;
                 if (!this.statusBarEntryAccessor.value) {
                     this.statusBarEntryAccessor.value = this.statusbarService.addEntry({
-                        name: ( localize(3544, "Current Problem")),
+                        name: ( localize(3587, "Current Problem")),
                         text,
                         ariaLabel: text
                     }, "statusbar.currentProblem", StatusbarAlignment.LEFT);
                 } else {
                     this.statusBarEntryAccessor.value.update({
-                        name: ( localize(3544, "Current Problem")),
+                        name: ( localize(3587, "Current Problem")),
                         text,
                         ariaLabel: text
                     });
@@ -1017,7 +1017,7 @@ class ChangeLanguageAction extends Action2 {
     constructor() {
         super({
             id: ChangeLanguageAction.ID,
-            title: ( localize2(3545, "Change Language Mode")),
+            title: ( localize2(3588, "Change Language Mode")),
             f1: true,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -1025,9 +1025,9 @@ class ChangeLanguageAction extends Action2 {
             },
             precondition: ContextKeyExpr.not("notebookEditorFocused"),
             metadata: {
-                description: ( localize(3546, "Change the language mode of the active text editor.")),
+                description: ( localize(3589, "Change the language mode of the active text editor.")),
                 args: [{
-                    name: ( localize(3547, "The name of the language mode to change to.")),
+                    name: ( localize(3590, "The name of the language mode to change to.")),
                     constraint: value => typeof value === "string"
                 }]
             }
@@ -1047,7 +1047,7 @@ class ChangeLanguageAction extends Action2 {
         const activeTextEditorControl = getCodeEditor(editorService.activeTextEditorControl);
         if (!activeTextEditorControl) {
             await quickInputService.pick([{
-                label: ( localize(3516, "No text editor active at this time"))
+                label: ( localize(3559, "No text editor active at this time"))
             }]);
             return;
         }
@@ -1075,9 +1075,9 @@ class ChangeLanguageAction extends Action2 {
             const extensions = languageService.getExtensions(languageId).join(" ");
             let description;
             if (currentLanguageName === languageName) {
-                description = ( localize(3548, "({0}) - Configured Language", languageId));
+                description = ( localize(3591, "({0}) - Configured Language", languageId));
             } else {
-                description = ( localize(3549, "({0})", languageId));
+                description = ( localize(3592, "({0})", languageId));
             }
             return {
                 id: languageId,
@@ -1089,7 +1089,7 @@ class ChangeLanguageAction extends Action2 {
         }));
         picks.unshift({
             type: "separator",
-            label: ( localize(3550, "languages (identifier)"))
+            label: ( localize(3593, "languages (identifier)"))
         });
         let configureLanguageAssociations;
         let configureLanguageSettings;
@@ -1099,22 +1099,22 @@ class ChangeLanguageAction extends Action2 {
             if (galleryService.isEnabled()) {
                 galleryAction = toAction({
                     id: "workbench.action.showLanguageExtensions",
-                    label: ( localize(3551, "Search Marketplace Extensions for '{0}'...", ext)),
+                    label: ( localize(3594, "Search Marketplace Extensions for '{0}'...", ext)),
                     run: () => commandService.executeCommand("workbench.extensions.action.showExtensionsForLanguage", ext)
                 });
                 picks.unshift(galleryAction);
             }
             configureLanguageSettings = {
-                label: ( localize(3552, "Configure '{0}' language based settings...", currentLanguageName))
+                label: ( localize(3595, "Configure '{0}' language based settings...", currentLanguageName))
             };
             picks.unshift(configureLanguageSettings);
             configureLanguageAssociations = {
-                label: ( localize(3553, "Configure File Association for '{0}'...", ext))
+                label: ( localize(3596, "Configure File Association for '{0}'...", ext))
             };
             picks.unshift(configureLanguageAssociations);
         }
         const autoDetectLanguage = {
-            label: ( localize(3554, "Auto Detect"))
+            label: ( localize(3597, "Auto Detect"))
         };
         if (textModel && textModel.getValueLength() > 0) {
             picks.unshift(autoDetectLanguage);
@@ -1122,7 +1122,7 @@ class ChangeLanguageAction extends Action2 {
         const pick = typeof languageMode === "string" ? {
             label: languageMode
         } : await quickInputService.pick(picks, {
-            placeHolder: ( localize(3555, "Select Language Mode")),
+            placeHolder: ( localize(3598, "Select Language Mode")),
             matchOnDescription: true
         });
         if (!pick) {
@@ -1217,12 +1217,12 @@ class ChangeLanguageAction extends Action2 {
                 id: languageId,
                 label: languageName,
                 iconClasses: getIconClassesForLanguageId(languageId),
-                description: (languageId === currentAssociation) ? ( localize(3556, "Current Association")) : undefined
+                description: (languageId === currentAssociation) ? ( localize(3599, "Current Association")) : undefined
             };
         }));
         setTimeout(async () => {
             const language = await quickInputService.pick(picks, {
-                placeHolder: ( localize(3557, "Select Language Mode to Associate with '{0}'", extension || base))
+                placeHolder: ( localize(3600, "Select Language Mode to Associate with '{0}'", extension || base))
             });
             if (language) {
                 const fileAssociationsConfig = configurationService.inspect(FILES_ASSOCIATIONS_CONFIG);
@@ -1249,7 +1249,7 @@ class ChangeEOLAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.editor.changeEOL",
-            title: ( localize2(3558, "Change End of Line Sequence")),
+            title: ( localize2(3601, "Change End of Line Sequence")),
             f1: true
         });
     }
@@ -1259,13 +1259,13 @@ class ChangeEOLAction extends Action2 {
         const activeTextEditorControl = getCodeEditor(editorService.activeTextEditorControl);
         if (!activeTextEditorControl) {
             await quickInputService.pick([{
-                label: ( localize(3516, "No text editor active at this time"))
+                label: ( localize(3559, "No text editor active at this time"))
             }]);
             return;
         }
         if (editorService.activeEditor?.isReadonly()) {
             await quickInputService.pick([{
-                label: ( localize(3517, "The active code editor is read-only."))
+                label: ( localize(3560, "The active code editor is read-only."))
             }]);
             return;
         }
@@ -1279,7 +1279,7 @@ class ChangeEOLAction extends Action2 {
         }];
         const selectedIndex = (textModel?.getEOL() === "\n") ? 0 : 1;
         const eol = await quickInputService.pick(EOLOptions, {
-            placeHolder: ( localize(3559, "Select End of Line Sequence")),
+            placeHolder: ( localize(3602, "Select End of Line Sequence")),
             activeItem: EOLOptions[selectedIndex]
         });
         if (eol) {
@@ -1298,7 +1298,7 @@ class ChangeEncodingAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.editor.changeEncoding",
-            title: ( localize2(3560, "Change File Encoding")),
+            title: ( localize2(3603, "Change File Encoding")),
             f1: true
         });
     }
@@ -1312,29 +1312,29 @@ class ChangeEncodingAction extends Action2 {
         const activeTextEditorControl = getCodeEditor(editorService.activeTextEditorControl);
         if (!activeTextEditorControl) {
             await quickInputService.pick([{
-                label: ( localize(3516, "No text editor active at this time"))
+                label: ( localize(3559, "No text editor active at this time"))
             }]);
             return;
         }
         const activeEditorPane = editorService.activeEditorPane;
         if (!activeEditorPane) {
             await quickInputService.pick([{
-                label: ( localize(3516, "No text editor active at this time"))
+                label: ( localize(3559, "No text editor active at this time"))
             }]);
             return;
         }
         const encodingSupport = toEditorWithEncodingSupport(activeEditorPane.input);
         if (!encodingSupport) {
             await quickInputService.pick([{
-                label: ( localize(3561, "No file active at this time"))
+                label: ( localize(3604, "No file active at this time"))
             }]);
             return;
         }
         const saveWithEncodingPick = {
-            label: ( localize(3562, "Save with Encoding"))
+            label: ( localize(3605, "Save with Encoding"))
         };
         const reopenWithEncodingPick = {
-            label: ( localize(3563, "Reopen with Encoding"))
+            label: ( localize(3606, "Reopen with Encoding"))
         };
         if (!Language.isDefaultVariant()) {
             const saveWithEncodingAlias = "Save with Encoding";
@@ -1353,7 +1353,7 @@ class ChangeEncodingAction extends Action2 {
             action = reopenWithEncodingPick;
         } else {
             action = await quickInputService.pick([reopenWithEncodingPick, saveWithEncodingPick], {
-                placeHolder: ( localize(3520, "Select Action")),
+                placeHolder: ( localize(3563, "Select Action")),
                 matchOnDetail: true
             });
         }
@@ -1411,11 +1411,11 @@ class ChangeEncodingAction extends Action2 {
             picks.unshift({
                 id: guessedEncoding,
                 label: SUPPORTED_ENCODINGS[guessedEncoding].labelLong,
-                description: ( localize(3564, "Guessed from content"))
+                description: ( localize(3607, "Guessed from content"))
             });
         }
         const encoding = await quickInputService.pick(picks, {
-            placeHolder: isReopenWithEncoding ? ( localize(3565, "Select File Encoding to Reopen File")) : ( localize(3566, "Select File Encoding to Save with")),
+            placeHolder: isReopenWithEncoding ? ( localize(3608, "Select File Encoding to Reopen File")) : ( localize(3609, "Select File Encoding to Save with")),
             activeItem: items[typeof directMatchIndex === "number" ? directMatchIndex : typeof aliasMatchIndex === "number" ? aliasMatchIndex : -1]
         });
         if (!encoding) {
@@ -1431,11 +1431,11 @@ class ChangeEncodingAction extends Action2 {
                     confirmed
                 } = await dialogService.confirm({
                     message: ( localize(
-                        3567,
+                        3610,
                         "Do you want to revert the active text editor and reopen with a different encoding?"
                     )),
-                    detail: ( localize(3568, "This will discard any unsaved changes.")),
-                    primaryButton: ( localize(3569, "Discard Changes and Reopen"))
+                    detail: ( localize(3611, "This will discard any unsaved changes.")),
+                    primaryButton: ( localize(3612, "Discard Changes and Reopen"))
                 });
                 if (!confirmed) {
                     return;

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

@@ -69,6 +69,11 @@ export declare abstract class EditorTabsControl extends Themable implements IEdi
     private editorActionsToolbar;
     private readonly editorActionsToolbarDisposables;
     private readonly editorActionsDisposables;
+    private editorLayoutActionsSeparator;
+    protected editorLayoutActionsToolbarContainer: HTMLElement | undefined;
+    private editorLayoutActionsToolbar;
+    private readonly editorLayoutActionsToolbarDisposables;
+    private readonly editorLayoutActionsDisposables;
     private readonly contextMenuContextKeyService;
     private resourceContext;
     private editorPinnedContext;
@@ -85,10 +90,14 @@ export declare abstract class EditorTabsControl extends Themable implements IEdi
     private get editorActionsEnabled();
     protected createEditorActionsToolBar(parent: HTMLElement, classes: string[]): void;
     private handleEditorActionToolBarVisibility;
+    private handleEditorLayoutActionsToolBarVisibility;
     private doCreateEditorActionsToolBar;
+    private doCreateEditorLayoutActionsToolBar;
     private actionViewItemProvider;
     protected updateEditorActionsToolbar(): void;
+    private updateEditorLayoutActionsToolbar;
     protected abstract prepareEditorActions(editorActions: IToolbarActions): IToolbarActions;
+    protected abstract prepareEditorLayoutActions(editorActions: IToolbarActions): IToolbarActions;
     private getEditorPaneAwareContextKeyService;
     protected clearEditorActionsToolbar(): void;
     protected onGroupDragStart(e: DragEvent, element: HTMLElement): boolean;

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

@@ -4,7 +4,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import * as editortabscontrol from './media/editortabscontrol.css';
 import { localize } from '../../../../nls.js';
 import { DataTransfers } from '../../../../base/browser/dnd.js';
-import { $, getActiveWindow, isMouseEvent, getWindow } from '../../../../base/browser/dom.js';
+import { $, setVisibility, getActiveWindow, isMouseEvent, getWindow } from '../../../../base/browser/dom.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { ActionsOrientation, prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { ActionRunner } from '../../../../base/common/actions.js';
@@ -28,7 +28,7 @@ import { assertReturnsDefined } from '../../../../base/common/types.js';
 import { isFirefox } from '../../../../base/browser/browser.js';
 import { isCancellationError } from '../../../../base/common/errors.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
-import { WorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';
+import { WorkbenchToolBar, HiddenItemStrategy } from '../../../../platform/actions/browser/toolbar.js';
 import { LocalSelectionTransfer } from '../../../../platform/dnd/browser/dnd.js';
 import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.service.js';
 import { EDITOR_CORE_NAVIGATION_COMMANDS } from './editorCommands.js';
@@ -103,6 +103,8 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         this.treeItemsTransfer = LocalSelectionTransfer.getInstance();
         this.editorActionsToolbarDisposables = this._register(( new DisposableStore()));
         this.editorActionsDisposables = this._register(( new DisposableStore()));
+        this.editorLayoutActionsToolbarDisposables = this._register(( new DisposableStore()));
+        this.editorLayoutActionsDisposables = this._register(( new DisposableStore()));
         this.renderDropdownAsChildElement = false;
         const container = this.create(parent);
         this.contextMenuContextKeyService = this._register(this.contextKeyService.createScoped(container));
@@ -129,6 +131,11 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         this.editorActionsToolbarContainer.classList.add(...classes);
         parent.appendChild(this.editorActionsToolbarContainer);
         this.handleEditorActionToolBarVisibility(this.editorActionsToolbarContainer);
+        this.editorLayoutActionsSeparator = $("div.editor-actions-separator");
+        parent.appendChild(this.editorLayoutActionsSeparator);
+        this.editorLayoutActionsToolbarContainer = $("div.editor-layout-actions");
+        parent.appendChild(this.editorLayoutActionsToolbarContainer);
+        this.handleEditorLayoutActionsToolBarVisibility(this.editorLayoutActionsToolbarContainer);
     }
     handleEditorActionToolBarVisibility(container) {
         const editorActionsEnabled = this.editorActionsEnabled;
@@ -144,6 +151,23 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         }
         container.classList.toggle("hidden", !editorActionsEnabled);
     }
+    handleEditorLayoutActionsToolBarVisibility(container) {
+        const editorActionsEnabled = this.editorActionsEnabled;
+        const editorActionsVisible = !!this.editorLayoutActionsToolbar;
+        if (editorActionsEnabled && !editorActionsVisible) {
+            this.doCreateEditorLayoutActionsToolBar(container);
+        }
+        else if (!editorActionsEnabled && editorActionsVisible) {
+            this.editorLayoutActionsToolbar?.getElement().remove();
+            this.editorLayoutActionsToolbar = undefined;
+            this.editorLayoutActionsToolbarDisposables.clear();
+            this.editorLayoutActionsDisposables.clear();
+        }
+        container.classList.toggle("hidden", !editorActionsEnabled);
+        if (this.editorLayoutActionsSeparator && !editorActionsEnabled) {
+            setVisibility(false, this.editorLayoutActionsSeparator);
+        }
+    }
     doCreateEditorActionsToolBar(container) {
         const context = {
             groupId: this.groupView.id
@@ -151,7 +175,7 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         this.editorActionsToolbar = this.editorActionsToolbarDisposables.add(this.instantiationService.createInstance(WorkbenchToolBar, container, {
             actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
             orientation: ActionsOrientation.HORIZONTAL,
-            ariaLabel: ( localize(3570, "Editor actions")),
+            ariaLabel: ( localize(3613, "Editor actions")),
             getKeyBinding: action => this.getKeybinding(action),
             actionRunner: this.editorActionsToolbarDisposables.add(( new EditorCommandsContextActionRunner(context))),
             anchorAlignmentProvider: () => AnchorAlignment.RIGHT,
@@ -171,6 +195,30 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
             }
         }));
     }
+    doCreateEditorLayoutActionsToolBar(container) {
+        const context = {
+            groupId: this.groupView.id
+        };
+        this.editorLayoutActionsToolbar = this.editorLayoutActionsToolbarDisposables.add(this.instantiationService.createInstance(WorkbenchToolBar, container, {
+            actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
+            orientation: ActionsOrientation.HORIZONTAL,
+            ariaLabel: ( localize(3614, "Editor layout actions")),
+            getKeyBinding: action => this.getKeybinding(action),
+            actionRunner: this.editorLayoutActionsToolbarDisposables.add(( new EditorCommandsContextActionRunner(context))),
+            anchorAlignmentProvider: () => AnchorAlignment.RIGHT,
+            renderDropdownAsChildElement: this.renderDropdownAsChildElement,
+            telemetrySource: "editorPartTrailing",
+            resetMenu: MenuId.EditorTitleLayout,
+            hiddenItemStrategy: HiddenItemStrategy.NoHide,
+            highlightToggledItems: true
+        }));
+        this.editorLayoutActionsToolbar.context = context;
+        this.editorLayoutActionsToolbarDisposables.add(this.editorLayoutActionsToolbar.actionRunner.onDidRun(e => {
+            if (e.error && !isCancellationError(e.error)) {
+                this.notificationService.error(e.error);
+            }
+        }));
+    }
     actionViewItemProvider(action, options) {
         const activeEditorPane = this.groupView.activeEditorPane;
         if (activeEditorPane instanceof EditorPane) {
@@ -197,6 +245,26 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
             secondary
         } = this.prepareEditorActions(editorActions.actions);
         editorActionsToolbar.setActions(prepareActions(primary), prepareActions(secondary));
+        this.updateEditorLayoutActionsToolbar();
+    }
+    updateEditorLayoutActionsToolbar() {
+        if (!this.editorActionsEnabled || !this.editorLayoutActionsToolbar) {
+            return;
+        }
+        this.editorLayoutActionsDisposables.clear();
+        const editorActions = this.groupView.createEditorActions(this.editorLayoutActionsDisposables, MenuId.EditorTitleLayout);
+        this.editorLayoutActionsDisposables.add(editorActions.onDidChange(() => this.updateEditorLayoutActionsToolbar()));
+        const {
+            primary,
+            secondary
+        } = this.prepareEditorLayoutActions(editorActions.actions);
+        this.editorLayoutActionsToolbar.setActions(prepareActions(primary), prepareActions(secondary));
+        if (this.editorLayoutActionsSeparator) {
+            setVisibility(
+                primary.length > 0 || secondary.length > 0,
+                this.editorLayoutActionsSeparator
+            );
+        }
     }
     getEditorPaneAwareContextKeyService() {
         return this.groupView.activeEditorPane?.scopedContextKeyService ?? this.contextKeyService;
@@ -207,6 +275,10 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         }
         const editorActionsToolbar = assertReturnsDefined(this.editorActionsToolbar);
         editorActionsToolbar.setActions([], []);
+        this.editorLayoutActionsToolbar?.setActions([], []);
+        if (this.editorLayoutActionsSeparator) {
+            setVisibility(false, this.editorLayoutActionsSeparator);
+        }
     }
     onGroupDragStart(e, element) {
         if (e.target !== element) {
@@ -236,7 +308,7 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         if (this.groupView.activeEditor) {
             let label = this.groupView.activeEditor.getName();
             if (this.groupsView.partOptions.showTabs === "multiple" && this.groupView.count > 1) {
-                label = ( localize(3571, "{0} (+{1})", label, this.groupView.count - 1));
+                label = ( localize(3615, "{0} (+{1})", label, this.groupView.count - 1));
             }
             applyDragImage(e, element, label);
         }
@@ -385,6 +457,10 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
                 this.handleEditorActionToolBarVisibility(this.editorActionsToolbarContainer);
                 this.updateEditorActionsToolbar();
             }
+            if (this.editorLayoutActionsToolbarContainer) {
+                this.handleEditorLayoutActionsToolBarVisibility(this.editorLayoutActionsToolbarContainer);
+                this.updateEditorLayoutActionsToolbar();
+            }
         }
     }
 };

package/vscode/src/vs/workbench/browser/parts/editor/media/modalEditorPart.css

@@ -94,6 +94,10 @@
 	background-color: var(--vscode-titleBar-activeBackground);
 	border-bottom: 1px solid var(--vscode-titleBar-border, transparent);
 
+	&.dragging {
+		cursor: grabbing;
+	}
+
 	/* Modal Editor Sidebar Toggle */
 	.modal-editor-sidebar-toggle {
 		grid-column: 1;