@codingame/monaco-vscode-api 33.0.9 → 34.0.1

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

@@ -271,12 +271,12 @@ class StatusInputMode extends Disposable {
         );
     }
 }
-const nlsSingleSelectionRange = ( localize(3575, "Ln {0}, Col {1} ({2} selected)"));
-const nlsSingleSelection = ( localize(3576, "Ln {0}, Col {1}"));
-const nlsMultiSelectionRange = ( localize(3577, "{0} selections ({1} characters selected)"));
-const nlsMultiSelection = ( localize(3578, "{0} selections"));
-const nlsEOLLF = ( localize(3579, "LF"));
-const nlsEOLCRLF = ( localize(3580, "CRLF"));
+const nlsSingleSelectionRange = ( localize(3634, "Ln {0}, Col {1} ({2} selected)"));
+const nlsSingleSelection = ( localize(3635, "Ln {0}, Col {1}"));
+const nlsMultiSelectionRange = ( localize(3636, "{0} selections ({1} characters selected)"));
+const nlsMultiSelection = ( localize(3637, "{0} selections"));
+const nlsEOLLF = ( localize(3638, "LF"));
+const nlsEOLCRLF = ( localize(3639, "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(3581, "No text editor active at this time"))
+                label: ( localize(3640, "No text editor active at this time"))
             }]);
         }
         if (this.editorService.activeEditor?.isReadonly()) {
             return this.quickInputService.pick([{
-                label: ( localize(3582, "The active code editor is read-only."))
+                label: ( localize(3641, "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(3583, "convert file"))
+            label: ( localize(3642, "convert file"))
         });
         picks.unshift({
             type: "separator",
-            label: ( localize(3584, "change view"))
+            label: ( localize(3643, "change view"))
         });
         const action = await this.quickInputService.pick(picks, {
-            placeHolder: ( localize(3585, "Select Action")),
+            placeHolder: ( localize(3644, "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(3586, "Tab Moves Focus"));
+                const text = ( localize(3645, "Tab Moves Focus"));
                 this.tabFocusModeElement.value = this.statusbarService.addEntry({
-                    name: ( localize(3587, "Accessibility Mode")),
+                    name: ( localize(3646, "Accessibility Mode")),
                     text,
                     ariaLabel: text,
-                    tooltip: ( localize(3588, "Disable Accessibility Mode")),
+                    tooltip: ( localize(3647, "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(3589, "OVR"));
-                const name = ( localize(3590, "Enable Insert Mode"));
+                const text = ( localize(3648, "OVR"));
+                const name = ( localize(3649, "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(3591, "Column Selection"));
+                const text = ( localize(3650, "Column Selection"));
                 this.columnSelectionModeElement.value = this.statusbarService.addEntry({
-                    name: ( localize(3592, "Column Selection Mode")),
+                    name: ( localize(3651, "Column Selection Mode")),
                     text,
                     ariaLabel: text,
-                    tooltip: ( localize(3593, "Disable Column Selection Mode")),
+                    tooltip: ( localize(3652, "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(3594, "Editor Selection")),
+            name: ( localize(3653, "Editor Selection")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3595, "Go to Line/Column")),
+            tooltip: ( localize(3654, "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(3596, "Editor Indentation")),
+            name: ( localize(3655, "Editor Indentation")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3597, "Select Indentation")),
+            tooltip: ( localize(3656, "Select Indentation")),
             command: `changeEditorIndentation${this.targetWindowId}`
         };
         this.updateElement(
@@ -496,10 +496,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(3598, "Editor Encoding")),
+            name: ( localize(3657, "Editor Encoding")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3599, "Select Encoding")),
+            tooltip: ( localize(3658, "Select Encoding")),
             command: "workbench.action.editor.changeEncoding"
         };
         this.updateElement(
@@ -516,10 +516,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(3600, "Editor End of Line")),
+            name: ( localize(3659, "Editor End of Line")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3601, "Select End of Line Sequence")),
+            tooltip: ( localize(3660, "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(3602, "Editor Language")),
+            name: ( localize(3661, "Editor Language")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3603, "Select Language Mode")),
+            tooltip: ( localize(3662, "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(3604, "File Information")),
+            name: ( localize(3663, "File Information")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3605, "File Information"))
+            tooltip: ( localize(3664, "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(3606, "Spaces: {0}", modelOpts.indentSize)) : ( localize(
-                    3607,
+                update.indentation = (modelOpts.insertSpaces ? modelOpts.tabSize === modelOpts.indentSize ? ( localize(3665, "Spaces: {0}", modelOpts.indentSize)) : ( localize(
+                    3666,
                     "Spaces: {0} (Tab Size: {1})",
                     modelOpts.indentSize,
                     modelOpts.tabSize
-                )) : ( localize(3608, "Tab Size: {0}", modelOpts.tabSize)));
+                )) : ( localize(3667, "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(3609, "Current Problem")),
+                        name: ( localize(3668, "Current Problem")),
                         text,
                         ariaLabel: text
                     }, "statusbar.currentProblem", StatusbarAlignment.LEFT);
                 } else {
                     this.statusBarEntryAccessor.value.update({
-                        name: ( localize(3609, "Current Problem")),
+                        name: ( localize(3668, "Current Problem")),
                         text,
                         ariaLabel: text
                     });
@@ -1017,7 +1017,7 @@ class ChangeLanguageAction extends Action2 {
     constructor() {
         super({
             id: ChangeLanguageAction.ID,
-            title: ( localize2(3610, "Change Language Mode")),
+            title: ( localize2(3669, "Change Language Mode")),
             f1: true,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -1025,9 +1025,9 @@ class ChangeLanguageAction extends Action2 {
             },
             precondition: ContextKeyExpr.not("notebookEditorFocused"),
             metadata: {
-                description: ( localize(3611, "Change the language mode of the active text editor.")),
+                description: ( localize(3670, "Change the language mode of the active text editor.")),
                 args: [{
-                    name: ( localize(3612, "The name of the language mode to change to.")),
+                    name: ( localize(3671, "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(3581, "No text editor active at this time"))
+                label: ( localize(3640, "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(3613, "({0}) - Configured Language", languageId));
+                description = ( localize(3672, "({0}) - Configured Language", languageId));
             } else {
-                description = ( localize(3614, "({0})", languageId));
+                description = ( localize(3673, "({0})", languageId));
             }
             return {
                 id: languageId,
@@ -1089,7 +1089,7 @@ class ChangeLanguageAction extends Action2 {
         }));
         picks.unshift({
             type: "separator",
-            label: ( localize(3615, "languages (identifier)"))
+            label: ( localize(3674, "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(3616, "Search Marketplace Extensions for '{0}'...", ext)),
+                    label: ( localize(3675, "Search Marketplace Extensions for '{0}'...", ext)),
                     run: () => commandService.executeCommand("workbench.extensions.action.showExtensionsForLanguage", ext)
                 });
                 picks.unshift(galleryAction);
             }
             configureLanguageSettings = {
-                label: ( localize(3617, "Configure '{0}' language based settings...", currentLanguageName))
+                label: ( localize(3676, "Configure '{0}' language based settings...", currentLanguageName))
             };
             picks.unshift(configureLanguageSettings);
             configureLanguageAssociations = {
-                label: ( localize(3618, "Configure File Association for '{0}'...", ext))
+                label: ( localize(3677, "Configure File Association for '{0}'...", ext))
             };
             picks.unshift(configureLanguageAssociations);
         }
         const autoDetectLanguage = {
-            label: ( localize(3619, "Auto Detect"))
+            label: ( localize(3678, "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(3620, "Select Language Mode")),
+            placeHolder: ( localize(3679, "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(3621, "Current Association")) : undefined
+                description: (languageId === currentAssociation) ? ( localize(3680, "Current Association")) : undefined
             };
         }));
         setTimeout(async () => {
             const language = await quickInputService.pick(picks, {
-                placeHolder: ( localize(3622, "Select Language Mode to Associate with '{0}'", extension || base))
+                placeHolder: ( localize(3681, "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(3623, "Change End of Line Sequence")),
+            title: ( localize2(3682, "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(3581, "No text editor active at this time"))
+                label: ( localize(3640, "No text editor active at this time"))
             }]);
             return;
         }
         if (editorService.activeEditor?.isReadonly()) {
             await quickInputService.pick([{
-                label: ( localize(3582, "The active code editor is read-only."))
+                label: ( localize(3641, "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(3624, "Select End of Line Sequence")),
+            placeHolder: ( localize(3683, "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(3625, "Change File Encoding")),
+            title: ( localize2(3684, "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(3581, "No text editor active at this time"))
+                label: ( localize(3640, "No text editor active at this time"))
             }]);
             return;
         }
         const activeEditorPane = editorService.activeEditorPane;
         if (!activeEditorPane) {
             await quickInputService.pick([{
-                label: ( localize(3581, "No text editor active at this time"))
+                label: ( localize(3640, "No text editor active at this time"))
             }]);
             return;
         }
         const encodingSupport = toEditorWithEncodingSupport(activeEditorPane.input);
         if (!encodingSupport) {
             await quickInputService.pick([{
-                label: ( localize(3626, "No file active at this time"))
+                label: ( localize(3685, "No file active at this time"))
             }]);
             return;
         }
         const saveWithEncodingPick = {
-            label: ( localize(3627, "Save with Encoding"))
+            label: ( localize(3686, "Save with Encoding"))
         };
         const reopenWithEncodingPick = {
-            label: ( localize(3628, "Reopen with Encoding"))
+            label: ( localize(3687, "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(3585, "Select Action")),
+                placeHolder: ( localize(3644, "Select Action")),
                 matchOnDetail: true
             });
         }
@@ -1411,11 +1411,11 @@ class ChangeEncodingAction extends Action2 {
             picks.unshift({
                 id: guessedEncoding,
                 label: SUPPORTED_ENCODINGS[guessedEncoding].labelLong,
-                description: ( localize(3629, "Guessed from content"))
+                description: ( localize(3688, "Guessed from content"))
             });
         }
         const encoding = await quickInputService.pick(picks, {
-            placeHolder: isReopenWithEncoding ? ( localize(3630, "Select File Encoding to Reopen File")) : ( localize(3631, "Select File Encoding to Save with")),
+            placeHolder: isReopenWithEncoding ? ( localize(3689, "Select File Encoding to Reopen File")) : ( localize(3690, "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(
-                        3632,
+                        3691,
                         "Do you want to revert the active text editor and reopen with a different encoding?"
                     )),
-                    detail: ( localize(3633, "This will discard any unsaved changes.")),
-                    primaryButton: ( localize(3634, "Discard Changes and Reopen"))
+                    detail: ( localize(3692, "This will discard any unsaved changes.")),
+                    primaryButton: ( localize(3693, "Discard Changes and Reopen"))
                 });
                 if (!confirmed) {
                     return;

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

@@ -175,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(3635, "Editor actions")),
+            ariaLabel: ( localize(3694, "Editor actions")),
             getKeyBinding: action => this.getKeybinding(action),
             actionRunner: this.editorActionsToolbarDisposables.add(( new EditorCommandsContextActionRunner(context))),
             anchorAlignmentProvider: () => AnchorAlignment.RIGHT,
@@ -202,7 +202,7 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         this.editorLayoutActionsToolbar = this.editorLayoutActionsToolbarDisposables.add(this.instantiationService.createInstance(WorkbenchToolBar, container, {
             actionViewItemProvider: (action, options) => this.actionViewItemProvider(action, options),
             orientation: ActionsOrientation.HORIZONTAL,
-            ariaLabel: ( localize(3636, "Editor layout actions")),
+            ariaLabel: ( localize(3695, "Editor layout actions")),
             getKeyBinding: action => this.getKeybinding(action),
             actionRunner: this.editorLayoutActionsToolbarDisposables.add(( new EditorCommandsContextActionRunner(context))),
             anchorAlignmentProvider: () => AnchorAlignment.RIGHT,
@@ -308,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(3637, "{0} (+{1})", label, this.groupView.count - 1));
+                label = ( localize(3696, "{0} (+{1})", label, this.groupView.count - 1));
             }
             applyDragImage(e, element, label);
         }

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

@@ -14,7 +14,7 @@
 	z-index: 2540;
 	/* Never allow content to escape above the title bar */
 	overflow: hidden;
-	background: rgba(0, 0, 0, 0.3);
+	background: rgba(0, 0, 0, 0.5);
 
 	.modal-editor-resizable {
 		position: absolute;
@@ -97,7 +97,6 @@
 	&.dragging {
 		cursor: grabbing;
 	}
-
 	/* Modal Editor Sidebar Toggle */
 	.modal-editor-sidebar-toggle {
 		grid-column: 1;
@@ -194,3 +193,16 @@
 		}
 	}
 }
+
+/** Compact Header: simplified header chrome opted in by individual editors */
+.monaco-modal-editor-block.compact-header .modal-editor-header {
+	background-color: var(--vscode-editor-background);
+	border-bottom: none;
+	height: 40px;
+	min-height: 40px;
+}
+
+.monaco-modal-editor-block.compact-header .modal-editor-title .monaco-icon-label::before,
+.monaco-modal-editor-block.compact-header .modal-editor-title .monaco-icon-label > .monaco-icon-label-iconpath {
+	display: none;
+}

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

@@ -37,6 +37,7 @@ import { mainWindow } from '../../../../base/browser/window.js';
 import { localize } from '../../../../nls.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { CLOSE_MODAL_EDITOR_COMMAND_ID, MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID, MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID, TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID, NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID, NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID, TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID } from './editorCommands.js';
+import { isModalEditorOptionsProvider } from '../../../../platform/editor/common/editor.js';
 
 var ModalEditorPartImpl_1;
 registerCss(modalEditorPart);
@@ -131,7 +132,7 @@ let ModalEditorPart = class ModalEditorPart {
             hide(sidebarToggleContainer);
         }
         const sidebarToggleIcon = options?.sidebar?.sidebarHidden ? Codicon.layoutSidebarLeftOff : Codicon.layoutSidebarLeft;
-        const sidebarToggleAction = disposables.add(( new Action(TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID, ( localize(3638, "Toggle Sidebar")), ThemeIcon.asClassName(sidebarToggleIcon), true)));
+        const sidebarToggleAction = disposables.add(( new Action(TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID, ( localize(3697, "Toggle Sidebar")), ThemeIcon.asClassName(sidebarToggleIcon), true)));
         const sidebarToggleActionBar = disposables.add(( new ActionBar(sidebarToggleContainer)));
         sidebarToggleActionBar.push(sidebarToggleAction, {
             icon: true,
@@ -146,7 +147,7 @@ let ModalEditorPart = class ModalEditorPart {
             addDisposableListener(navigationContainer, EventType.DBLCLICK, e => EventHelper.stop(e, true))
         );
         const previousButton = disposables.add(( new Button(navigationContainer, {
-            title: ( localize(3639, "Previous"))
+            title: ( localize(3698, "Previous"))
         })));
         previousButton.icon = Codicon.chevronLeft;
         previousButton.element.classList.add("modal-editor-nav-button");
@@ -159,7 +160,7 @@ let ModalEditorPart = class ModalEditorPart {
         const navigationLabel = append(navigationContainer, $("span.modal-editor-nav-label"));
         navigationLabel.setAttribute("aria-live", "polite");
         const nextButton = disposables.add(( new Button(navigationContainer, {
-            title: ( localize(3640, "Next"))
+            title: ( localize(3699, "Next"))
         })));
         nextButton.icon = Codicon.chevronRight;
         nextButton.element.classList.add("modal-editor-nav-button");
@@ -170,7 +171,7 @@ let ModalEditorPart = class ModalEditorPart {
             }
         }));
         const actionBarContainer = append(headerElement, $("div.modal-editor-action-container"));
-        const sidebarResult = this.createSidebar(editorPartContainer, options?.sidebar, disposables);
+        const sidebarResult = this.createSidebar(editorPartContainer, headerElement, options?.sidebar, disposables);
         if (sidebarResult) {
             if (sidebarResult.isVisible()) {
                 editorPartContainer.classList.add("has-sidebar");
@@ -190,7 +191,7 @@ let ModalEditorPart = class ModalEditorPart {
         disposables.add(Event.runAndSubscribe(editorPart.onDidChangeNavigation, (navigation => {
             if (navigation && navigation.total > 1) {
                 show(navigationContainer);
-                navigationLabel.textContent = ( localize(3641, "{0} of {1}", navigation.current + 1, navigation.total));
+                navigationLabel.textContent = ( localize(3700, "{0} of {1}", navigation.current + 1, navigation.total));
                 previousButton.enabled = navigation.current > 0;
                 nextButton.enabled = navigation.current < navigation.total - 1;
             } else {
@@ -329,14 +330,15 @@ let ModalEditorPart = class ModalEditorPart {
                 left: leftPx
             } = resizableElement.domNode.style;
             const sidebarWidth = sidebarResult?.getWidth() ?? 0;
+            const headerHeight = headerElement.offsetHeight;
             editorPart.layout(
                 Math.max(0, modalWidth - MODAL_BORDER_SIZE - sidebarWidth),
-                modalHeight - MODAL_BORDER_SIZE - MODAL_HEADER_HEIGHT,
-                parseFloat(topPx) + MODAL_BORDER_WIDTH + MODAL_HEADER_HEIGHT,
+                modalHeight - MODAL_BORDER_SIZE - headerHeight,
+                parseFloat(topPx) + MODAL_BORDER_WIDTH + headerHeight,
                 parseFloat(leftPx) + MODAL_BORDER_WIDTH + sidebarWidth
             );
             if (sizeChanged) {
-                sidebarResult?.layout(modalHeight - MODAL_BORDER_SIZE - MODAL_HEADER_HEIGHT);
+                sidebarResult?.layout(modalHeight - MODAL_BORDER_SIZE - headerHeight);
             }
         };
         const dragMonitor = disposables.add(( new GlobalPointerMoveMonitor()));
@@ -549,6 +551,12 @@ let ModalEditorPart = class ModalEditorPart {
         );
         disposables.add(editorPart.onDidChangeMaximized(() => layoutModal()));
         disposables.add(editorPart.onDidRequestLayout(() => layoutModal()));
+        disposables.add(Event.runAndSubscribe(modalEditorService.onDidActiveEditorChange, () => {
+            const activeEditor = editorPart.activeGroup.activeEditor;
+            const editorModalOptions = isModalEditorOptionsProvider(activeEditor) ? activeEditor.getModalEditorOptions() : undefined;
+            modalElement.classList.toggle("compact-header", !!editorModalOptions?.compactHeader);
+            layoutModal();
+        }));
         this.hostService.setWindowDimmed(mainWindow, true);
         disposables.add(toDisposable(() => this.hostService.setWindowDimmed(mainWindow, false)));
         editorPart.activeGroup.focus();
@@ -558,7 +566,7 @@ let ModalEditorPart = class ModalEditorPart {
             disposables
         };
     }
-    createSidebar(container, content, disposables) {
+    createSidebar(container, headerElement, content, disposables) {
         if (!content) {
             return undefined;
         }
@@ -571,10 +579,11 @@ let ModalEditorPart = class ModalEditorPart {
         const onDidLayoutEmitter = disposables.add(( new Emitter()));
         const contentDisposable = disposables.add(( new MutableDisposable()));
         contentDisposable.value = content.render(sidebarContainer, onDidLayoutEmitter.event);
+        const getHeaderHeight = () => (headerElement.offsetHeight || MODAL_HEADER_HEIGHT);
         const sash = disposables.add(( new Sash(container, {
             getVerticalSashLeft: () => sidebarWidth,
-            getVerticalSashTop: () => MODAL_HEADER_HEIGHT,
-            getVerticalSashHeight: () => (container.clientHeight - MODAL_HEADER_HEIGHT)
+            getVerticalSashTop: () => getHeaderHeight(),
+            getVerticalSashHeight: () => (container.clientHeight - getHeaderHeight())
         }, {
             orientation: Orientation.VERTICAL
         })));
@@ -704,7 +713,7 @@ let ModalEditorPartImpl = class ModalEditorPartImpl extends EditorPart {
         contextKeyService
     ) {
         const id = ModalEditorPartImpl_1.COUNTER++;
-        super(editorPartsView, `workbench.parts.modalEditor.${id}`, ( localize(3642, "Modal Editor Area")), windowId, instantiationService, themeService, configurationService, storageService, layoutService, hostService, contextKeyService);
+        super(editorPartsView, `workbench.parts.modalEditor.${id}`, ( localize(3701, "Modal Editor Area")), windowId, instantiationService, themeService, configurationService, storageService, layoutService, hostService, contextKeyService);
         this.modalElement = modalElement;
         this._onWillClose = this._register(( new Emitter()));
         this.onWillClose = this._onWillClose.event;

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

@@ -651,7 +651,7 @@ let MultiEditorTabsControl = class MultiEditorTabsControl extends EditorTabsCont
             }
         }));
         const tabActionBar = ( new ActionBar(tabActionsContainer, {
-            ariaLabel: ( localize(3643, "Tab actions")),
+            ariaLabel: ( localize(3702, "Tab actions")),
             actionRunner: tabActionRunner
         }));
         const tabActionListener = tabActionBar.onWillRun(e => {

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

@@ -208,7 +208,7 @@ let SideBySideEditor = class SideBySideEditor extends AbstractEditorWithViewStat
         if (this.input) {
             return this.input.getName();
         }
-        return localize(3644, "Side by Side Editor");
+        return localize(3703, "Side by Side Editor");
     }
     async setInput(input, options, context, token) {
         const oldInput = this.input;

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

@@ -20,7 +20,7 @@ class AbstractTextCodeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return localize(3645, "Text Editor");
+        return localize(3704, "Text Editor");
     }
     createEditorControl(parent, initialOptions) {
         this.editorControl = this._register(this.instantiationService.createInstance(

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

@@ -78,7 +78,7 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return localize(3646, "Text Diff Editor");
+        return localize(3705, "Text Diff Editor");
     }
     createEditorControl(parent, configuration) {
         this.diffEditorControl = this._register(
@@ -142,13 +142,13 @@ let TextDiffEditor = class TextDiffEditor extends AbstractTextEditor {
             let message;
             if (error instanceof TooLargeFileOperationError) {
                 message = ( localize(
-                    3647,
+                    3706,
                     "At least one file is not displayed in the text compare editor because it is very large ({0}).",
                     ByteSize.formatSize(error.size)
                 ));
             } else {
                 message = ( localize(
-                    3648,
+                    3707,
                     "At least one file is not displayed in the text compare editor because it is very large."
                 ));
             }