@codingame/monaco-vscode-api 34.1.3 → 35.0.0

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

@@ -271,12 +271,12 @@ class StatusInputMode extends Disposable {
         );
     }
 }
-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"));
+const nlsSingleSelectionRange = ( localize(3710, "Ln {0}, Col {1} ({2} selected)"));
+const nlsSingleSelection = ( localize(3711, "Ln {0}, Col {1}"));
+const nlsMultiSelectionRange = ( localize(3712, "{0} selections ({1} characters selected)"));
+const nlsMultiSelection = ( localize(3713, "{0} selections"));
+const nlsEOLLF = ( localize(3714, "LF"));
+const nlsEOLCRLF = ( localize(3715, "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(3640, "No text editor active at this time"))
+                label: ( localize(3716, "No text editor active at this time"))
             }]);
         }
         if (this.editorService.activeEditor?.isReadonly()) {
             return this.quickInputService.pick([{
-                label: ( localize(3641, "The active code editor is read-only."))
+                label: ( localize(3717, "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(3642, "convert file"))
+            label: ( localize(3718, "convert file"))
         });
         picks.unshift({
             type: "separator",
-            label: ( localize(3643, "change view"))
+            label: ( localize(3719, "change view"))
         });
         const action = await this.quickInputService.pick(picks, {
-            placeHolder: ( localize(3644, "Select Action")),
+            placeHolder: ( localize(3720, "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(3645, "Tab Moves Focus"));
+                const text = ( localize(3721, "Tab Moves Focus"));
                 this.tabFocusModeElement.value = this.statusbarService.addEntry({
-                    name: ( localize(3646, "Accessibility Mode")),
+                    name: ( localize(3722, "Accessibility Mode")),
                     text,
                     ariaLabel: text,
-                    tooltip: ( localize(3647, "Disable Accessibility Mode")),
+                    tooltip: ( localize(3723, "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(3648, "OVR"));
-                const name = ( localize(3649, "Enable Insert Mode"));
+                const text = ( localize(3724, "OVR"));
+                const name = ( localize(3725, "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(3650, "Column Selection"));
+                const text = ( localize(3726, "Column Selection"));
                 this.columnSelectionModeElement.value = this.statusbarService.addEntry({
-                    name: ( localize(3651, "Column Selection Mode")),
+                    name: ( localize(3727, "Column Selection Mode")),
                     text,
                     ariaLabel: text,
-                    tooltip: ( localize(3652, "Disable Column Selection Mode")),
+                    tooltip: ( localize(3728, "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(3653, "Editor Selection")),
+            name: ( localize(3729, "Editor Selection")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3654, "Go to Line/Column")),
+            tooltip: ( localize(3730, "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(3655, "Editor Indentation")),
+            name: ( localize(3731, "Editor Indentation")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3656, "Select Indentation")),
+            tooltip: ( localize(3732, "Select Indentation")),
             command: `changeEditorIndentation${this.targetWindowId}`
         };
         this.updateElement(
@@ -496,10 +496,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(3657, "Editor Encoding")),
+            name: ( localize(3733, "Editor Encoding")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3658, "Select Encoding")),
+            tooltip: ( localize(3734, "Select Encoding")),
             command: "workbench.action.editor.changeEncoding"
         };
         this.updateElement(
@@ -516,10 +516,10 @@ let EditorStatus = class EditorStatus extends Disposable {
             return;
         }
         const props = {
-            name: ( localize(3659, "Editor End of Line")),
+            name: ( localize(3735, "Editor End of Line")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3660, "Select End of Line Sequence")),
+            tooltip: ( localize(3736, "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(3661, "Editor Language")),
+            name: ( localize(3737, "Editor Language")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3662, "Select Language Mode")),
+            tooltip: ( localize(3738, "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(3663, "File Information")),
+            name: ( localize(3739, "File Information")),
             text,
             ariaLabel: text,
-            tooltip: ( localize(3664, "File Information"))
+            tooltip: ( localize(3740, "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(3665, "Spaces: {0}", modelOpts.indentSize)) : ( localize(
-                    3666,
+                update.indentation = (modelOpts.insertSpaces ? modelOpts.tabSize === modelOpts.indentSize ? ( localize(3741, "Spaces: {0}", modelOpts.indentSize)) : ( localize(
+                    3742,
                     "Spaces: {0} (Tab Size: {1})",
                     modelOpts.indentSize,
                     modelOpts.tabSize
-                )) : ( localize(3667, "Tab Size: {0}", modelOpts.tabSize)));
+                )) : ( localize(3743, "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(3668, "Current Problem")),
+                        name: ( localize(3744, "Current Problem")),
                         text,
                         ariaLabel: text
                     }, "statusbar.currentProblem", StatusbarAlignment.LEFT);
                 } else {
                     this.statusBarEntryAccessor.value.update({
-                        name: ( localize(3668, "Current Problem")),
+                        name: ( localize(3744, "Current Problem")),
                         text,
                         ariaLabel: text
                     });
@@ -1017,7 +1017,7 @@ class ChangeLanguageAction extends Action2 {
     constructor() {
         super({
             id: ChangeLanguageAction.ID,
-            title: ( localize2(3669, "Change Language Mode")),
+            title: ( localize2(3745, "Change Language Mode")),
             f1: true,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -1025,9 +1025,9 @@ class ChangeLanguageAction extends Action2 {
             },
             precondition: ContextKeyExpr.not("notebookEditorFocused"),
             metadata: {
-                description: ( localize(3670, "Change the language mode of the active text editor.")),
+                description: ( localize(3746, "Change the language mode of the active text editor.")),
                 args: [{
-                    name: ( localize(3671, "The name of the language mode to change to.")),
+                    name: ( localize(3747, "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(3640, "No text editor active at this time"))
+                label: ( localize(3716, "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(3672, "({0}) - Configured Language", languageId));
+                description = ( localize(3748, "({0}) - Configured Language", languageId));
             } else {
-                description = ( localize(3673, "({0})", languageId));
+                description = ( localize(3749, "({0})", languageId));
             }
             return {
                 id: languageId,
@@ -1089,7 +1089,7 @@ class ChangeLanguageAction extends Action2 {
         }));
         picks.unshift({
             type: "separator",
-            label: ( localize(3674, "languages (identifier)"))
+            label: ( localize(3750, "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(3675, "Search Marketplace Extensions for '{0}'...", ext)),
+                    label: ( localize(3751, "Search Marketplace Extensions for '{0}'...", ext)),
                     run: () => commandService.executeCommand("workbench.extensions.action.showExtensionsForLanguage", ext)
                 });
                 picks.unshift(galleryAction);
             }
             configureLanguageSettings = {
-                label: ( localize(3676, "Configure '{0}' language based settings...", currentLanguageName))
+                label: ( localize(3752, "Configure '{0}' language based settings...", currentLanguageName))
             };
             picks.unshift(configureLanguageSettings);
             configureLanguageAssociations = {
-                label: ( localize(3677, "Configure File Association for '{0}'...", ext))
+                label: ( localize(3753, "Configure File Association for '{0}'...", ext))
             };
             picks.unshift(configureLanguageAssociations);
         }
         const autoDetectLanguage = {
-            label: ( localize(3678, "Auto Detect"))
+            label: ( localize(3754, "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(3679, "Select Language Mode")),
+            placeHolder: ( localize(3755, "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(3680, "Current Association")) : undefined
+                description: (languageId === currentAssociation) ? ( localize(3756, "Current Association")) : undefined
             };
         }));
         setTimeout(async () => {
             const language = await quickInputService.pick(picks, {
-                placeHolder: ( localize(3681, "Select Language Mode to Associate with '{0}'", extension || base))
+                placeHolder: ( localize(3757, "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(3682, "Change End of Line Sequence")),
+            title: ( localize2(3758, "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(3640, "No text editor active at this time"))
+                label: ( localize(3716, "No text editor active at this time"))
             }]);
             return;
         }
         if (editorService.activeEditor?.isReadonly()) {
             await quickInputService.pick([{
-                label: ( localize(3641, "The active code editor is read-only."))
+                label: ( localize(3717, "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(3683, "Select End of Line Sequence")),
+            placeHolder: ( localize(3759, "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(3684, "Change File Encoding")),
+            title: ( localize2(3760, "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(3640, "No text editor active at this time"))
+                label: ( localize(3716, "No text editor active at this time"))
             }]);
             return;
         }
         const activeEditorPane = editorService.activeEditorPane;
         if (!activeEditorPane) {
             await quickInputService.pick([{
-                label: ( localize(3640, "No text editor active at this time"))
+                label: ( localize(3716, "No text editor active at this time"))
             }]);
             return;
         }
         const encodingSupport = toEditorWithEncodingSupport(activeEditorPane.input);
         if (!encodingSupport) {
             await quickInputService.pick([{
-                label: ( localize(3685, "No file active at this time"))
+                label: ( localize(3761, "No file active at this time"))
             }]);
             return;
         }
         const saveWithEncodingPick = {
-            label: ( localize(3686, "Save with Encoding"))
+            label: ( localize(3762, "Save with Encoding"))
         };
         const reopenWithEncodingPick = {
-            label: ( localize(3687, "Reopen with Encoding"))
+            label: ( localize(3763, "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(3644, "Select Action")),
+                placeHolder: ( localize(3720, "Select Action")),
                 matchOnDetail: true
             });
         }
@@ -1411,11 +1411,11 @@ class ChangeEncodingAction extends Action2 {
             picks.unshift({
                 id: guessedEncoding,
                 label: SUPPORTED_ENCODINGS[guessedEncoding].labelLong,
-                description: ( localize(3688, "Guessed from content"))
+                description: ( localize(3764, "Guessed from content"))
             });
         }
         const encoding = await quickInputService.pick(picks, {
-            placeHolder: isReopenWithEncoding ? ( localize(3689, "Select File Encoding to Reopen File")) : ( localize(3690, "Select File Encoding to Save with")),
+            placeHolder: isReopenWithEncoding ? ( localize(3765, "Select File Encoding to Reopen File")) : ( localize(3766, "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(
-                        3691,
+                        3767,
                         "Do you want to revert the active text editor and reopen with a different encoding?"
                     )),
-                    detail: ( localize(3692, "This will discard any unsaved changes.")),
-                    primaryButton: ( localize(3693, "Discard Changes and Reopen"))
+                    detail: ( localize(3768, "This will discard any unsaved changes.")),
+                    primaryButton: ( localize(3769, "Discard Changes and Reopen"))
                 });
                 if (!confirmed) {
                     return;

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

@@ -2,6 +2,7 @@ import { Dimension } from "../../../../base/browser/dom.js";
 import { IAction, ActionRunner } from "../../../../base/common/actions.js";
 import { ResolvedKeybinding } from "../../../../base/common/keybindings.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { IMenuService } from "../../../../platform/actions/common/actions.service.js";
 import { IContextKeyService } from "../../../../platform/contextkey/common/contextkey.service.js";
 import { IContextMenuService } from "../../../../platform/contextview/browser/contextView.service.js";
 import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
@@ -61,6 +62,7 @@ export declare abstract class EditorTabsControl extends Themable implements IEdi
     protected quickInputService: IQuickInputService;
     private readonly editorResolverService;
     private readonly hostService;
+    protected readonly menuService: IMenuService;
     protected readonly editorTransfer: LocalSelectionTransfer<DraggedEditorIdentifier>;
     protected readonly groupTransfer: LocalSelectionTransfer<DraggedEditorGroupIdentifier>;
     protected readonly treeItemsTransfer: LocalSelectionTransfer<DraggedTreeItemsIdentifier>;
@@ -85,7 +87,7 @@ export declare abstract class EditorTabsControl extends Themable implements IEdi
     private sideBySideEditorContext;
     private groupLockedContext;
     private renderDropdownAsChildElement;
-    constructor(parent: HTMLElement, editorPartsView: IEditorPartsView, groupsView: IEditorGroupsView, groupView: IEditorGroupView, tabsModel: IReadonlyEditorGroupModel, contextMenuService: IContextMenuService, instantiationService: IInstantiationService, contextKeyService: IContextKeyService, keybindingService: IKeybindingService, notificationService: INotificationService, quickInputService: IQuickInputService, themeService: IThemeService, editorResolverService: IEditorResolverService, hostService: IHostService);
+    constructor(parent: HTMLElement, editorPartsView: IEditorPartsView, groupsView: IEditorGroupsView, groupView: IEditorGroupView, tabsModel: IReadonlyEditorGroupModel, contextMenuService: IContextMenuService, instantiationService: IInstantiationService, contextKeyService: IContextKeyService, keybindingService: IKeybindingService, notificationService: INotificationService, quickInputService: IQuickInputService, themeService: IThemeService, editorResolverService: IEditorResolverService, hostService: IHostService, menuService: IMenuService);
     protected create(parent: HTMLElement): HTMLElement;
     private get editorActionsEnabled();
     protected createEditorActionsToolBar(parent: HTMLElement, classes: string[]): void;
@@ -109,7 +111,7 @@ export declare abstract class EditorTabsControl extends Themable implements IEdi
     protected onTabContextMenu(editor: EditorInput, e: Event, node: HTMLElement): void;
     protected getKeybinding(action: IAction): ResolvedKeybinding | undefined;
     protected getKeybindingLabel(action: IAction): string | undefined;
-    protected get tabHeight(): 35 | 22;
+    protected get tabHeight(): 32 | 35 | 22 | 28;
     protected getHoverTitle(editor: EditorInput): string | IManagedHoverTooltipMarkdownString;
     protected updateTabHeight(): void;
     updateOptions(oldOptions: IEditorPartOptions, newOptions: IEditorPartOptions): void;

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

@@ -11,6 +11,7 @@ import { ActionRunner } from '../../../../base/common/actions.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -65,7 +66,9 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
     static {
         this.EDITOR_TAB_HEIGHT = {
             normal: 35,
-            compact: 22
+            compact: 22,
+            styleOverride: 32,
+            styleOverrideCompact: 28
         };
     }
     constructor(
@@ -82,7 +85,8 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         quickInputService,
         themeService,
         editorResolverService,
-        hostService
+        hostService,
+        menuService
     ) {
         super(themeService);
         this.parent = parent;
@@ -98,6 +102,7 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         this.quickInputService = quickInputService;
         this.editorResolverService = editorResolverService;
         this.hostService = hostService;
+        this.menuService = menuService;
         this.editorTransfer = LocalSelectionTransfer.getInstance();
         this.groupTransfer = LocalSelectionTransfer.getInstance();
         this.treeItemsTransfer = LocalSelectionTransfer.getInstance();
@@ -175,7 +180,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(3694, "Editor actions")),
+            ariaLabel: ( localize(3770, "Editor actions")),
             getKeyBinding: action => this.getKeybinding(action),
             actionRunner: this.editorActionsToolbarDisposables.add(( new EditorCommandsContextActionRunner(context))),
             anchorAlignmentProvider: () => AnchorAlignment.RIGHT,
@@ -202,7 +207,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(3695, "Editor layout actions")),
+            ariaLabel: ( localize(3771, "Editor layout actions")),
             getKeyBinding: action => this.getKeybinding(action),
             actionRunner: this.editorLayoutActionsToolbarDisposables.add(( new EditorCommandsContextActionRunner(context))),
             anchorAlignmentProvider: () => AnchorAlignment.RIGHT,
@@ -308,7 +313,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(3696, "{0} (+{1})", label, this.groupView.count - 1));
+                label = ( localize(3772, "{0} (+{1})", label, this.groupView.count - 1));
             }
             applyDragImage(e, element, label);
         }
@@ -428,7 +433,11 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         return keybinding ? keybinding.getLabel() ?? undefined : undefined;
     }
     get tabHeight() {
-        return this.groupsView.partOptions.tabHeight !== "compact" ? EditorTabsControl_1.EDITOR_TAB_HEIGHT.normal : EditorTabsControl_1.EDITOR_TAB_HEIGHT.compact;
+        const isCompact = this.groupsView.partOptions.tabHeight === "compact";
+        if (this.parent.classList.contains("tabs") && this.parent.closest(".style-override")) {
+            return isCompact ? EditorTabsControl_1.EDITOR_TAB_HEIGHT.styleOverrideCompact : EditorTabsControl_1.EDITOR_TAB_HEIGHT.styleOverride;
+        }
+        return isCompact ? EditorTabsControl_1.EDITOR_TAB_HEIGHT.compact : EditorTabsControl_1.EDITOR_TAB_HEIGHT.normal;
     }
     getHoverTitle(editor) {
         const title = editor.getTitle(Verbosity.LONG);
@@ -447,6 +456,7 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
     }
     updateTabHeight() {
         this.parent.style.setProperty("--editor-group-tab-height", `${this.tabHeight}px`);
+        this.parent.classList.toggle("compact-height", this.groupsView.partOptions.tabHeight === "compact");
     }
     updateOptions(oldOptions, newOptions) {
         if (oldOptions.tabHeight !== newOptions.tabHeight) {
@@ -464,6 +474,6 @@ let EditorTabsControl = class EditorTabsControl extends Themable {
         }
     }
 };
-EditorTabsControl = EditorTabsControl_1 = ( __decorate([( __param(5, IContextMenuService)), ( __param(6, IInstantiationService)), ( __param(7, IContextKeyService)), ( __param(8, IKeybindingService)), ( __param(9, INotificationService)), ( __param(10, IQuickInputService)), ( __param(11, IThemeService)), ( __param(12, IEditorResolverService)), ( __param(13, IHostService))], EditorTabsControl));
+EditorTabsControl = EditorTabsControl_1 = ( __decorate([( __param(5, IContextMenuService)), ( __param(6, IInstantiationService)), ( __param(7, IContextKeyService)), ( __param(8, IKeybindingService)), ( __param(9, INotificationService)), ( __param(10, IQuickInputService)), ( __param(11, IThemeService)), ( __param(12, IEditorResolverService)), ( __param(13, IHostService)), ( __param(14, IMenuService))], EditorTabsControl));
 
 export { EditorCommandsContextActionRunner, EditorTabsControl };

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

@@ -80,7 +80,24 @@
 
 /* Watermark & shortcuts */
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark  {
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark-wrapper {
+	position: relative;
+	width: 100%;
+	height: 100%;
+}
+
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark-wrapper > .editor-group-watermark-toolbar-container {
+	position: absolute;
+	top: 0;
+	right: 0;
+	height: 35px;
+	display: flex;
+	align-items: center;
+	padding: 0 8px;
+	box-sizing: border-box;
+}
+
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark-wrapper > .editor-group-watermark  {
 	display: flex;
 	height: 100%;
 	max-width: 272px;
@@ -90,7 +107,7 @@
 	justify-content: center;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark > .watermark-container {
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark-wrapper > .editor-group-watermark > .watermark-container {
 	display: flex;
 	width: 100%;
 	flex-direction: column;
@@ -99,17 +116,17 @@
 	gap: 24px;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container:not(.empty) > .editor-group-watermark {
+.monaco-workbench .part.editor > .content .editor-group-container:not(.empty) > .editor-group-watermark-wrapper {
 	display: none;
 }
 
-.monaco-workbench .part.editor > .content:not(.empty) .editor-group-container.empty > .editor-group-watermark,
-.monaco-workbench .part.editor > .content.auxiliary .editor-group-container.empty > .editor-group-watermark {
+.monaco-workbench .part.editor > .content:not(.empty) .editor-group-container.empty > .editor-group-watermark-wrapper > .editor-group-watermark,
+.monaco-workbench .part.editor > .content.auxiliary .editor-group-container.empty > .editor-group-watermark-wrapper > .editor-group-watermark {
 	max-width: 200px;
 	height: calc(100% - 70px);
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .letterpress {
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark-wrapper .editor-group-watermark .letterpress {
 	width: 100%;
 	max-height: 100%;
 	aspect-ratio: 1/1;
@@ -132,22 +149,22 @@
 	background-image: url('./letterpress-hcDark.svg');
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .shortcuts {
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark-wrapper .editor-group-watermark .shortcuts {
 	width: 100%;
 }
 
-.monaco-workbench .part.editor > .content:not(.empty) .editor-group-container > .editor-group-watermark .shortcuts,
-.monaco-workbench .part.editor > .content.auxiliary .editor-group-container > .editor-group-watermark .shortcuts,
-.monaco-workbench .part.editor > .content .editor-group-container.max-height-478px > .editor-group-watermark .shortcuts {
+.monaco-workbench .part.editor > .content:not(.empty) .editor-group-container > .editor-group-watermark-wrapper .editor-group-watermark .shortcuts,
+.monaco-workbench .part.editor > .content.auxiliary .editor-group-container > .editor-group-watermark-wrapper .editor-group-watermark .shortcuts,
+.monaco-workbench .part.editor > .content .editor-group-container.max-height-478px > .editor-group-watermark-wrapper .editor-group-watermark .shortcuts {
 	display: none;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .shortcuts > .watermark-box {
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark-wrapper .editor-group-watermark .shortcuts > .watermark-box {
 	display: flex;
 	flex-direction: column;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .shortcuts dl {
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark-wrapper .editor-group-watermark .shortcuts dl {
 	display: flex;
 	justify-content: space-between;
 	margin: 4px 0;
@@ -155,19 +172,19 @@
 	color: var(--vscode-descriptionForeground);
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .shortcuts dl:first-of-type {
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark-wrapper .editor-group-watermark .shortcuts dl:first-of-type {
 	margin-top: 0;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .shortcuts dl:last-of-type {
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark-wrapper .editor-group-watermark .shortcuts dl:last-of-type {
 	margin-bottom: 0;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .shortcuts dt {
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark-wrapper .editor-group-watermark .shortcuts dt {
 	letter-spacing: 0.04em;
 }
 
-.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark .shortcuts dd {
+.monaco-workbench .part.editor > .content .editor-group-container > .editor-group-watermark-wrapper .editor-group-watermark .shortcuts dd {
 	text-align: left;
 	margin-inline-start: 24px;
 }