@codingame/monaco-vscode-api 30.0.1 → 31.0.0

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

@@ -55,6 +55,7 @@ export declare const MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID = "workbench.action.
 export declare const TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID = "workbench.action.toggleModalEditorMaximized";
 export declare const NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID = "workbench.action.navigateModalEditorPrevious";
 export declare const NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID = "workbench.action.navigateModalEditorNext";
+export declare const TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID = "workbench.action.toggleModalEditorSidebar";
 export declare const API_OPEN_EDITOR_COMMAND_ID = "_workbench.open";
 export declare const API_OPEN_DIFF_EDITOR_COMMAND_ID = "_workbench.diff";
 export declare const API_OPEN_WITH_EDITOR_COMMAND_ID = "_workbench.openWith";

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

@@ -23,7 +23,7 @@ import { ITelemetryService } from '../../../../platform/telemetry/common/telemet
 import { ActiveGroupEditorsByMostRecentlyUsedQuickAccess } from './editorQuickAccess.js';
 import { SideBySideEditor } from './sideBySideEditor.js';
 import { TextDiffEditor } from './textDiffEditor.js';
-import { ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, TextCompareEditorActiveContext, ActiveEditorGroupLockedContext, ActiveEditorStickyContext, IsSessionsWindowContext, EditorPartModalContext, EditorPartModalMaximizedContext, EditorPartModalNavigationContext } from '../../../common/contextkeys.js';
+import { ActiveEditorGroupEmptyContext, MultipleEditorGroupsContext, ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext, TextCompareEditorActiveContext, ActiveEditorGroupLockedContext, ActiveEditorStickyContext, IsSessionsWindowContext, EditorPartModalContext, EditorPartModalSidebarContext, EditorPartModalMaximizedContext, EditorPartModalNavigationContext } from '../../../common/contextkeys.js';
 import { EditorInputCapabilities, EditorsOrder, CloseDirection, isEditorInputWithOptionsAndGroup } from '../../../common/editor.js';
 import { SideBySideEditorInput } from '../../../common/editor/sideBySideEditorInput.js';
 import { columnToEditorGroup } from '../../../services/editor/common/editorGroupColumn.js';
@@ -93,6 +93,7 @@ const MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID = "workbench.action.moveModalEditor
 const TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID = "workbench.action.toggleModalEditorMaximized";
 const NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID = "workbench.action.navigateModalEditorPrevious";
 const NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID = "workbench.action.navigateModalEditorNext";
+const TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID = "workbench.action.toggleModalEditorSidebar";
 const API_OPEN_EDITOR_COMMAND_ID = "_workbench.open";
 const API_OPEN_DIFF_EDITOR_COMMAND_ID = "_workbench.diff";
 const API_OPEN_WITH_EDITOR_COMMAND_ID = "_workbench.openWith";
@@ -143,11 +144,11 @@ function registerEditorMoveCopyCommand() {
         primary: 0,
         handler: (accessor, args) => moveCopySelectedEditors(true, args, accessor),
         metadata: {
-            description: ( localize(3440, "Move the active editor by tabs or groups")),
+            description: ( localize(3438, "Move the active editor by tabs or groups")),
             args: [{
-                name: ( localize(3441, "Active editor move argument")),
+                name: ( localize(3439, "Active editor move argument")),
                 description: ( localize(
-                    3442,
+                    3440,
                     "Argument Properties:\n\t* 'to': String value providing where to move.\n\t* 'by': String value providing the unit for move (by tab or by group).\n\t* 'value': Number value providing how many positions or an absolute position to move."
                 )),
                 constraint: isSelectedEditorsMoveCopyArg,
@@ -162,11 +163,11 @@ function registerEditorMoveCopyCommand() {
         primary: 0,
         handler: (accessor, args) => moveCopySelectedEditors(false, args, accessor),
         metadata: {
-            description: ( localize(3443, "Copy the active editor by groups")),
+            description: ( localize(3441, "Copy the active editor by groups")),
             args: [{
-                name: ( localize(3444, "Active editor copy argument")),
+                name: ( localize(3442, "Active editor copy argument")),
                 description: ( localize(
-                    3445,
+                    3443,
                     "Argument Properties:\n\t* 'to': String value providing where to copy.\n\t* 'value': Number value providing how many positions or an absolute position to copy."
                 )),
                 constraint: isSelectedEditorsMoveCopyArg,
@@ -376,7 +377,7 @@ function registerEditorGroupsLayoutCommands() {
                             "default": 0,
                             "description": `The orientation of the root group in the layout. 0 for horizontal, 1 for vertical.`,
                             "enum": [0, 1],
-                            "enumDescriptions": [( localize(3446, "Horizontal")), ( localize(3447, "Vertical"))]
+                            "enumDescriptions": [( localize(3444, "Horizontal")), ( localize(3445, "Vertical"))]
                         },
                         "groups": {
                             "$ref": "#/definitions/editorGroupsSchema",
@@ -1119,7 +1120,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: SPLIT_EDITOR_IN_GROUP,
-                title: ( localize2(3448, "Split Editor in Group")),
+                title: ( localize2(3446, "Split Editor in Group")),
                 category: Categories.View,
                 precondition: ActiveEditorCanSplitInGroupContext,
                 f1: true,
@@ -1182,7 +1183,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: JOIN_EDITOR_IN_GROUP,
-                title: ( localize2(3449, "Join Editor in Group")),
+                title: ( localize2(3447, "Join Editor in Group")),
                 category: Categories.View,
                 precondition: SideBySideEditorActiveContext,
                 f1: true,
@@ -1209,7 +1210,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: TOGGLE_SPLIT_EDITOR_IN_GROUP,
-                title: ( localize2(3450, "Toggle Split Editor in Group")),
+                title: ( localize2(3448, "Toggle Split Editor in Group")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(ActiveEditorCanSplitInGroupContext, SideBySideEditorActiveContext)),
                 f1: true
@@ -1239,7 +1240,7 @@ function registerSplitEditorInGroupCommands() {
         constructor() {
             super({
                 id: TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT,
-                title: ( localize2(3451, "Toggle Layout of Split Editor in Group")),
+                title: ( localize2(3449, "Toggle Layout of Split Editor in Group")),
                 category: Categories.View,
                 precondition: SideBySideEditorActiveContext,
                 f1: true
@@ -1263,7 +1264,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_FIRST_SIDE_EDITOR,
-                title: ( localize2(3452, "Focus First Side in Active Editor")),
+                title: ( localize2(3450, "Focus First Side in Active Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1284,7 +1285,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_SECOND_SIDE_EDITOR,
-                title: ( localize2(3453, "Focus Second Side in Active Editor")),
+                title: ( localize2(3451, "Focus Second Side in Active Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1305,7 +1306,7 @@ function registerFocusSideEditorsCommands() {
         constructor() {
             super({
                 id: FOCUS_OTHER_SIDE_EDITOR,
-                title: ( localize2(3454, "Focus Other Side in Active Editor")),
+                title: ( localize2(3452, "Focus Other Side in Active Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.or(SideBySideEditorActiveContext, TextCompareEditorActiveContext)),
                 f1: true
@@ -1373,7 +1374,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: TOGGLE_LOCK_GROUP_COMMAND_ID,
-                title: ( localize2(3455, "Toggle Editor Group Lock")),
+                title: ( localize2(3453, "Toggle Editor Group Lock")),
                 category: Categories.View,
                 f1: true
             });
@@ -1386,7 +1387,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: LOCK_GROUP_COMMAND_ID,
-                title: ( localize2(3456, "Lock Editor Group")),
+                title: ( localize2(3454, "Lock Editor Group")),
                 category: Categories.View,
                 precondition: ( ActiveEditorGroupLockedContext.toNegated()),
                 f1: true
@@ -1400,7 +1401,7 @@ function registerOtherEditorCommands() {
         constructor() {
             super({
                 id: UNLOCK_GROUP_COMMAND_ID,
-                title: ( localize2(3457, "Unlock Editor Group")),
+                title: ( localize2(3455, "Unlock Editor Group")),
                 precondition: ActiveEditorGroupLockedContext,
                 category: Categories.View,
                 f1: true
@@ -1481,7 +1482,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID,
-                title: ( localize2(3458, "Open Modal Editor in Main Window")),
+                title: ( localize2(3456, "Open Modal Editor in Main Window")),
                 category: Categories.View,
                 f1: true,
                 icon: Codicon.openInProduct,
@@ -1510,7 +1511,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID,
-                title: ( localize2(3459, "Open Modal Editor in New Window")),
+                title: ( localize2(3457, "Open Modal Editor in New Window")),
                 category: Categories.View,
                 f1: true,
                 icon: Codicon.emptyWindow,
@@ -1543,18 +1544,38 @@ function registerModalEditorCommands() {
             }
         }
     });
+    registerAction2(class extends Action2 {
+        constructor() {
+            super({
+                id: TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID,
+                title: ( localize2(3458, "Toggle Modal Editor Sidebar")),
+                category: Categories.View,
+                f1: true,
+                precondition: ( ContextKeyExpr.and(EditorPartModalContext, EditorPartModalSidebarContext))
+            });
+        }
+        run(accessor) {
+            const editorGroupsService = accessor.get(IEditorGroupsService);
+            for (const part of editorGroupsService.parts) {
+                if (isModalEditorPart(part)) {
+                    part.toggleSidebar();
+                    break;
+                }
+            }
+        }
+    });
     registerAction2(class extends Action2 {
         constructor() {
             super({
                 id: TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID,
-                title: ( localize2(3460, "Maximize Modal Editor")),
+                title: ( localize2(3459, "Maximize Modal Editor")),
                 category: Categories.View,
                 f1: true,
                 precondition: EditorPartModalContext,
                 icon: Codicon.screenFull,
                 toggled: {
                     condition: EditorPartModalMaximizedContext,
-                    title: ( localize(3461, "Restore Modal Editor"))
+                    title: ( localize(3460, "Restore Modal Editor"))
                 },
                 menu: {
                     id: MenuId.ModalEditorTitle,
@@ -1577,7 +1598,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: CLOSE_MODAL_EDITOR_COMMAND_ID,
-                title: ( localize2(3462, "Close Modal Editor")),
+                title: ( localize2(3461, "Close Modal Editor")),
                 category: Categories.View,
                 f1: true,
                 icon: Codicon.close,
@@ -1612,7 +1633,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID,
-                title: ( localize2(3463, "Navigate to Previous Item in Modal Editor")),
+                title: ( localize2(3462, "Navigate to Previous Item in Modal Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.and(EditorPartModalContext, EditorPartModalNavigationContext)),
                 keybinding: {
@@ -1639,7 +1660,7 @@ function registerModalEditorCommands() {
         constructor() {
             super({
                 id: NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID,
-                title: ( localize2(3464, "Navigate to Next Item in Modal Editor")),
+                title: ( localize2(3463, "Navigate to Next Item in Modal Editor")),
                 category: Categories.View,
                 precondition: ( ContextKeyExpr.and(EditorPartModalContext, EditorPartModalNavigationContext)),
                 keybinding: {
@@ -1683,4 +1704,4 @@ function setup() {
     registerModalEditorCommands();
 }
 
-export { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID, API_OPEN_WITH_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, CLOSE_MODAL_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, EDITOR_CORE_NAVIGATION_COMMANDS, FOCUS_ABOVE_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_BELOW_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_LEFT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_OTHER_SIDE_EDITOR, FOCUS_RIGHT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_SECOND_SIDE_EDITOR, JOIN_EDITOR_IN_GROUP, KEEP_EDITOR_COMMAND_ID, LAYOUT_EDITOR_GROUPS_COMMAND_ID, LOCK_GROUP_COMMAND_ID, MOVE_ACTIVE_EDITOR_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_INTO_ABOVE_GROUP, MOVE_EDITOR_INTO_BELOW_GROUP, MOVE_EDITOR_INTO_LEFT_GROUP, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_INTO_RIGHT_GROUP, MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID, MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID, NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID, NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, OPEN_EDITOR_AT_INDEX_COMMAND_ID, PIN_EDITOR_COMMAND_ID, REOPEN_ACTIVE_EDITOR_WITH_COMMAND_ID, REOPEN_WITH_COMMAND_ID, SHOW_EDITORS_IN_GROUP, SPLIT_EDITOR, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_IN_GROUP, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, TOGGLE_KEEP_EDITORS_COMMAND_ID, TOGGLE_LOCK_GROUP_COMMAND_ID, TOGGLE_MAXIMIZE_EDITOR_GROUP, TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID, TOGGLE_SPLIT_EDITOR_IN_GROUP, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, UNLOCK_GROUP_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, setup, splitEditor };
+export { API_OPEN_DIFF_EDITOR_COMMAND_ID, API_OPEN_EDITOR_COMMAND_ID, API_OPEN_WITH_EDITOR_COMMAND_ID, CLOSE_EDITORS_AND_GROUP_COMMAND_ID, CLOSE_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_EDITORS_TO_THE_RIGHT_COMMAND_ID, CLOSE_EDITOR_COMMAND_ID, CLOSE_EDITOR_GROUP_COMMAND_ID, CLOSE_MODAL_EDITOR_COMMAND_ID, CLOSE_OTHER_EDITORS_IN_GROUP_COMMAND_ID, CLOSE_PINNED_EDITOR_COMMAND_ID, CLOSE_SAVED_EDITORS_COMMAND_ID, COPY_ACTIVE_EDITOR_COMMAND_ID, COPY_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, COPY_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, EDITOR_CORE_NAVIGATION_COMMANDS, FOCUS_ABOVE_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_BELOW_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_FIRST_SIDE_EDITOR, FOCUS_LEFT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_OTHER_SIDE_EDITOR, FOCUS_RIGHT_GROUP_WITHOUT_WRAP_COMMAND_ID, FOCUS_SECOND_SIDE_EDITOR, JOIN_EDITOR_IN_GROUP, KEEP_EDITOR_COMMAND_ID, LAYOUT_EDITOR_GROUPS_COMMAND_ID, LOCK_GROUP_COMMAND_ID, MOVE_ACTIVE_EDITOR_COMMAND_ID, MOVE_EDITOR_GROUP_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_INTO_ABOVE_GROUP, MOVE_EDITOR_INTO_BELOW_GROUP, MOVE_EDITOR_INTO_LEFT_GROUP, MOVE_EDITOR_INTO_NEW_WINDOW_COMMAND_ID, MOVE_EDITOR_INTO_RIGHT_GROUP, MOVE_MODAL_EDITOR_TO_MAIN_COMMAND_ID, MOVE_MODAL_EDITOR_TO_WINDOW_COMMAND_ID, NAVIGATE_MODAL_EDITOR_NEXT_COMMAND_ID, NAVIGATE_MODAL_EDITOR_PREVIOUS_COMMAND_ID, NEW_EMPTY_EDITOR_WINDOW_COMMAND_ID, OPEN_EDITOR_AT_INDEX_COMMAND_ID, PIN_EDITOR_COMMAND_ID, REOPEN_ACTIVE_EDITOR_WITH_COMMAND_ID, REOPEN_WITH_COMMAND_ID, SHOW_EDITORS_IN_GROUP, SPLIT_EDITOR, SPLIT_EDITOR_DOWN, SPLIT_EDITOR_IN_GROUP, SPLIT_EDITOR_LEFT, SPLIT_EDITOR_RIGHT, SPLIT_EDITOR_UP, TOGGLE_KEEP_EDITORS_COMMAND_ID, TOGGLE_LOCK_GROUP_COMMAND_ID, TOGGLE_MAXIMIZE_EDITOR_GROUP, TOGGLE_MODAL_EDITOR_MAXIMIZED_COMMAND_ID, TOGGLE_MODAL_EDITOR_SIDEBAR_COMMAND_ID, TOGGLE_SPLIT_EDITOR_IN_GROUP, TOGGLE_SPLIT_EDITOR_IN_GROUP_LAYOUT, UNLOCK_GROUP_COMMAND_ID, UNPIN_EDITOR_COMMAND_ID, setup, splitEditor };

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

@@ -97,7 +97,7 @@ let DropOverlay = class DropOverlay extends Themable {
         this.overlay = $(".editor-group-overlay-indicator");
         container.appendChild(this.overlay);
         if (this.enableDropIntoEditor) {
-            this.dropIntoPromptElement = renderFormattedText(( localize(3473, "Hold __{0}__ to drop into editor", isMacintosh ? "⇧" : "Shift")), {});
+            this.dropIntoPromptElement = renderFormattedText(( localize(3472, "Hold __{0}__ to drop into editor", isMacintosh ? "⇧" : "Shift")), {});
             this.dropIntoPromptElement.classList.add("editor-group-overlay-drop-into-prompt");
             this.overlay.appendChild(this.dropIntoPromptElement);
         }

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

@@ -409,7 +409,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         const toolbarContainer = $(".editor-group-container-toolbar");
         this.element.appendChild(toolbarContainer);
         const containerToolbar = this._register(( new ActionBar(toolbarContainer, {
-            ariaLabel: ( localize(3474, "Empty editor group actions")),
+            ariaLabel: ( localize(3473, "Empty editor group actions")),
             highlightToggledItems: true
         })));
         const containerToolbarMenu = this._register(
@@ -500,7 +500,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         if (this.isEmpty) {
             this.element.classList.add("empty");
             this.element.tabIndex = 0;
-            this.element.setAttribute("aria-label", ( localize(3475, "{0} (empty)", this.ariaLabel)));
+            this.element.setAttribute("aria-label", ( localize(3474, "{0} (empty)", this.ariaLabel)));
         }
         else {
             this.element.classList.remove("empty");
@@ -743,15 +743,15 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
     }
     get label() {
         if (this.groupsLabel) {
-            return localize(3476, "{0}: Group {1}", this.groupsLabel, this._index + 1);
+            return localize(3475, "{0}: Group {1}", this.groupsLabel, this._index + 1);
         }
-        return localize(3477, "Group {0}", this._index + 1);
+        return localize(3476, "Group {0}", this._index + 1);
     }
     get ariaLabel() {
         if (this.groupsLabel) {
-            return localize(3478, "{0}: Editor Group {1}", this.groupsLabel, this._index + 1);
+            return localize(3477, "{0}: Editor Group {1}", this.groupsLabel, this._index + 1);
         }
-        return localize(3479, "Editor Group {0}", this._index + 1);
+        return localize(3478, "Editor Group {0}", this._index + 1);
     }
     get disposed() {
         return this._disposed;
@@ -1131,7 +1131,7 @@ let EditorGroupView = EditorGroupView_1 = class EditorGroupView extends Themable
         if (!keepCopy || editor.hasCapability(EditorInputCapabilities.Singleton) ) {
             const canMoveVeto = editor.canMove(this.id, target.id);
             if (typeof canMoveVeto === "string") {
-                this.dialogService.error(canMoveVeto, ( localize(3480, "Try saving or reverting the editor first and then try again.")));
+                this.dialogService.error(canMoveVeto, ( localize(3479, "Try saving or reverting the editor first and then try again.")));
                 return false;
             }
         }

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

@@ -18,9 +18,9 @@ import { WorkbenchState } from '../../../../platform/workspace/common/workspace.
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 
 var EditorGroupWatermark_1;
-const showChatContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.equals("chatSetupHidden", false)), ( ContextKeyExpr.equals("chatSetupDisabled", false))));
+const showChatContextKey = ( ContextKeyExpr.and(( ContextKeyExpr.equals("chatSetupHidden", false)), ( ContextKeyExpr.equals("chatSetupDisabledInWorkspace", false))));
 const openChat = {
-    text: ( localize(3481, "Open Chat")),
+    text: ( localize(3480, "Open Chat")),
     id: "workbench.action.chat.open",
     when: {
         native: showChatContextKey,
@@ -28,53 +28,53 @@ const openChat = {
     }
 };
 const showCommands = {
-    text: ( localize(3482, "Show All Commands")),
+    text: ( localize(3481, "Show All Commands")),
     id: "workbench.action.showCommands"
 };
 const gotoFile = {
-    text: ( localize(3483, "Go to File")),
+    text: ( localize(3482, "Go to File")),
     id: "workbench.action.quickOpen"
 };
 const openFile = {
-    text: ( localize(3484, "Open File")),
+    text: ( localize(3483, "Open File")),
     id: "workbench.action.files.openFile"
 };
 const openFolder = {
-    text: ( localize(3485, "Open Folder")),
+    text: ( localize(3484, "Open Folder")),
     id: "workbench.action.files.openFolder"
 };
 const openFileOrFolder = {
-    text: ( localize(3486, "Open File or Folder")),
+    text: ( localize(3485, "Open File or Folder")),
     id: "workbench.action.files.openFileFolder"
 };
 const openRecent = {
-    text: ( localize(3487, "Open Recent")),
+    text: ( localize(3486, "Open Recent")),
     id: "workbench.action.openRecent"
 };
 const newUntitledFile = {
-    text: ( localize(3488, "New Untitled Text File")),
+    text: ( localize(3487, "New Untitled Text File")),
     id: "workbench.action.files.newUntitledFile"
 };
 const findInFiles = {
-    text: ( localize(3489, "Find in Files")),
+    text: ( localize(3488, "Find in Files")),
     id: "workbench.action.findInFiles"
 };
 const toggleTerminal = {
-    text: ( localize(3490, "Toggle Terminal")),
+    text: ( localize(3489, "Toggle Terminal")),
     id: "workbench.action.terminal.toggleTerminal",
     when: {
         web: ( ContextKeyExpr.equals("terminalProcessSupported", true))
     }
 };
 const startDebugging = {
-    text: ( localize(3491, "Start Debugging")),
+    text: ( localize(3490, "Start Debugging")),
     id: "workbench.action.debug.start",
     when: {
         web: ( ContextKeyExpr.equals("terminalProcessSupported", true))
     }
 };
 const openSettings = {
-    text: ( localize(3492, "Open Settings")),
+    text: ( localize(3491, "Open Settings")),
     id: "workbench.action.openSettings"
 };
 const baseEntries = [openChat, showCommands];

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

@@ -144,7 +144,7 @@ let EditorPanes = class EditorPanes extends Disposable {
             }
         }
         if (!message) {
-            message = ( localize(3493, "Unable to open '{0}'", editor.getName()));
+            message = ( localize(3492, "Unable to open '{0}'", editor.getName()));
         }
         const buttons = [];
         if (errorActions && errorActions.length > 0) {
@@ -156,7 +156,7 @@ let EditorPanes = class EditorPanes extends Disposable {
             }
         } else {
             buttons.push({
-                label: ( localize(3494, "&&OK")),
+                label: ( localize(3493, "&&OK")),
                 run: () => undefined
             });
         }

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

@@ -32,6 +32,8 @@ interface IModalEditorPartState {
         readonly left: number;
         readonly top: number;
     };
+    readonly sidebarWidth?: number;
+    readonly sidebarHidden?: boolean;
 }
 interface IEditorPartsMemento {
     "editorparts.state"?: IEditorPartsUIState;
@@ -59,6 +61,8 @@ export declare class EditorParts extends MultiWindowParts<EditorPart, IEditorPar
     private modalEditorMaximized;
     private modalEditorSize;
     private modalEditorPosition;
+    private modalEditorSidebarWidth;
+    private modalEditorSidebarHidden;
     createModalEditorPart(options?: IModalEditorPartOptions): Promise<IModalEditorPart>;
     registerPart(part: EditorPart): IDisposable;
     protected unregisterPart(part: EditorPart): void;

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

@@ -85,6 +85,8 @@ let EditorParts = class EditorParts extends MultiWindowParts {
             this.modalEditorMaximized = modalState.maximized;
             this.modalEditorSize = modalState.size;
             this.modalEditorPosition = modalState.position;
+            this.modalEditorSidebarWidth = modalState.sidebarWidth;
+            this.modalEditorSidebarHidden = modalState.sidebarHidden;
         }
         this.mainPart = this._register(this.createMainEditorPart());
         this._register(this.registerPart(this.mainPart));
@@ -156,7 +158,12 @@ let EditorParts = class EditorParts extends MultiWindowParts {
             ...options,
             maximized: options?.maximized ?? this.modalEditorMaximized,
             size: options?.size ?? this.modalEditorSize,
-            position: options?.position ?? this.modalEditorPosition
+            position: options?.position ?? this.modalEditorPosition,
+            sidebar: options?.sidebar ? {
+                ...options.sidebar,
+                sidebarWidth: options.sidebar.sidebarWidth ?? this.modalEditorSidebarWidth,
+                sidebarHidden: options.sidebar.sidebarHidden ?? this.modalEditorSidebarHidden
+            } : undefined
         });
         this.modalEditorPart = part;
         this.modalPartInstantiationService = instantiationService;
@@ -164,6 +171,10 @@ let EditorParts = class EditorParts extends MultiWindowParts {
             this.modalEditorMaximized = part.maximized;
             this.modalEditorSize = part.size;
             this.modalEditorPosition = part.position;
+            if (part.hasSidebar) {
+                this.modalEditorSidebarWidth = part.sidebarWidth;
+                this.modalEditorSidebarHidden = part.sidebarHidden || undefined;
+            }
             this.modalPartInstantiationService = undefined;
             this.modalEditorPart = undefined;
         }));
@@ -225,7 +236,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         }
     }
     getGroupsLabel(index) {
-        return localize(3495, "Window {0}", index + 1);
+        return localize(3494, "Window {0}", index + 1);
     }
     getPartByDocument(document) {
         if (this._parts.size > 1) {
@@ -304,15 +315,21 @@ let EditorParts = class EditorParts extends MultiWindowParts {
             this.modalEditorMaximized = this.modalEditorPart.maximized;
             this.modalEditorSize = this.modalEditorPart.size;
             this.modalEditorPosition = this.modalEditorPart.position;
+            if (this.modalEditorPart.hasSidebar) {
+                this.modalEditorSidebarWidth = this.modalEditorPart.sidebarWidth;
+                this.modalEditorSidebarHidden = this.modalEditorPart.sidebarHidden || undefined;
+            }
         }
-        if (this.modalEditorMaximized || this.modalEditorSize || this.modalEditorPosition) {
+        if (this.modalEditorMaximized || this.modalEditorSize || this.modalEditorPosition || this.modalEditorSidebarWidth || this.modalEditorSidebarHidden) {
             this.profileMemento[EditorParts_1.MODAL_EDITOR_STATE_STORAGE_KEY] = {
                 maximized: this.modalEditorMaximized,
                 size: this.modalEditorSize ? {
                     width: this.modalEditorSize.width,
                     height: this.modalEditorSize.height
                 } : undefined,
-                position: this.modalEditorPosition
+                position: this.modalEditorPosition,
+                sidebarWidth: this.modalEditorSidebarWidth,
+                sidebarHidden: this.modalEditorSidebarHidden
             };
         } else {
             delete this.profileMemento[EditorParts_1.MODAL_EDITOR_STATE_STORAGE_KEY];

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

@@ -132,7 +132,7 @@ let WorkspaceTrustRequiredPlaceholderEditor = class WorkspaceTrustRequiredPlaceh
         this.ID = "workbench.editors.workspaceTrustRequiredEditor";
     }
     static {
-        this.LABEL = ( localize(3496, "Workspace Trust Required"));
+        this.LABEL = ( localize(3495, "Workspace Trust Required"));
     }
     static {
         this.DESCRIPTOR = EditorPaneDescriptor.create(this, this.ID, this.LABEL);
@@ -162,14 +162,14 @@ let WorkspaceTrustRequiredPlaceholderEditor = class WorkspaceTrustRequiredPlaceh
         return {
             icon: "$(workspace-untrusted)",
             label: isSingleFolderWorkspaceIdentifier(toWorkspaceIdentifier(this.workspaceService.getWorkspace())) ? ( localize(
-                3497,
+                3496,
                 "The file is not displayed in the editor because trust has not been granted to the folder."
             )) : ( localize(
-                3498,
+                3497,
                 "The file is not displayed in the editor because trust has not been granted to the workspace."
             )),
             actions: [{
-                label: ( localize(3499, "Manage Workspace Trust")),
+                label: ( localize(3498, "Manage Workspace Trust")),
                 run: () => this.commandService.executeCommand("workbench.trust.manage")
             }]
         };
@@ -184,7 +184,7 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
         this.ID = "workbench.editors.errorEditor";
     }
     static {
-        this.LABEL = ( localize(3500, "Error Editor"));
+        this.LABEL = ( localize(3499, "Error Editor"));
     }
     static {
         this.DESCRIPTOR = EditorPaneDescriptor.create(this, this.ID, this.LABEL);
@@ -215,16 +215,16 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
         const isFileNotFound = error?.fileOperationResult === FileOperationResult.FILE_NOT_FOUND;
         let label;
         if (isFileNotFound) {
-            label = ( localize(3501, "The editor could not be opened because the file was not found."));
+            label = ( localize(3500, "The editor could not be opened because the file was not found."));
         } else if (isEditorOpenError(error) && error.forceMessage) {
             label = error.message;
         } else if (error) {
             label = ( localize(
-                3502,
+                3501,
                 "The editor could not be opened due to an unexpected error. Please consult the log for more details."
             ));
         } else {
-            label = ( localize(3503, "The editor could not be opened due to an unexpected error."));
+            label = ( localize(3502, "The editor could not be opened due to an unexpected error."));
         }
         let icon = "$(error)";
         if (isEditorOpenError(error)) {
@@ -249,13 +249,13 @@ let ErrorPlaceholderEditor = class ErrorPlaceholderEditor extends EditorPlacehol
             }));
         } else {
             actions = [{
-                label: ( localize(3504, "Try Again")),
+                label: ( localize(3503, "Try Again")),
                 run: () => this.group.openEditor(input, {
                     ...options,
                     source: EditorOpenSource.USER
                 })
             }, {
-                label: ( localize(3505, "Show Logs")),
+                label: ( localize(3504, "Show Logs")),
                 run: () => this.commandService.executeCommand(showWindowLogActionId)
             }];
         }

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

@@ -15,6 +15,7 @@ import { getIconClasses } from '../../../../editor/common/services/getIconClasse
 import { prepareQuery, scoreItemFuzzy, compareItemsByFuzzyScore } from '../../../../base/common/fuzzyScorer.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
+import { URI } from '../../../../base/common/uri.js';
 
 var ActiveGroupEditorsByMostRecentlyUsedQuickAccess_1, AllEditorsByAppearanceQuickAccess_1, AllEditorsByMostRecentlyUsedQuickAccess_1;
 registerCss(editorquickaccess);
@@ -23,7 +24,7 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
         super(prefix, {
             canAcceptInBackground: true,
             noResultsPick: {
-                label: ( localize(3506, "No matching editors")),
+                label: ( localize(3505, "No matching editors")),
                 groupId: -1
             }
         });
@@ -132,6 +133,7 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
             const isDirty = editor.isDirty() && !editor.isSaving();
             const description = editor.getDescription();
             const nameAndDescription = description ? `${editor.getName()} ${description}` : editor.getName();
+            const icon = editor.getIcon();
             return {
                 groupId,
                 resource,
@@ -139,32 +141,29 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
                 ariaLabel: (() => {
                     if (mapGroupIdToGroupAriaLabel.size > 1) {
                         return isDirty ? ( localize(
-                            3507,
+                            3506,
                             "{0}, unsaved changes, {1}",
                             nameAndDescription,
                             mapGroupIdToGroupAriaLabel.get(groupId)
                         )) : ( localize(
-                            3508,
+                            3507,
                             "{0}, {1}",
                             nameAndDescription,
                             mapGroupIdToGroupAriaLabel.get(groupId)
                         ));
                     }
-                    return isDirty ? ( localize(3509, "{0}, unsaved changes", nameAndDescription)) : nameAndDescription;
+                    return isDirty ? ( localize(3508, "{0}, unsaved changes", nameAndDescription)) : nameAndDescription;
                 })(),
                 description,
-                iconClasses: getIconClasses(
-                    this.modelService,
-                    this.languageService,
-                    resource,
-                    undefined,
-                    editor.getIcon()
-                ).concat(editor.getLabelExtraClasses()),
+                iconPath: URI.isUri(icon) ? {
+                    dark: icon
+                } : undefined,
+                iconClasses: getIconClasses(this.modelService, this.languageService, resource, undefined, icon).concat(editor.getLabelExtraClasses()),
                 italic: !this.editorGroupService.getGroup(groupId)?.isPinned(editor),
                 buttons: (() => {
                     return [{
                         iconClass: isDirty ? ("dirty-editor " + ThemeIcon.asClassName(Codicon.closeDirty)) : ThemeIcon.asClassName(Codicon.close),
-                        tooltip: ( localize(3510, "Close Editor")),
+                        tooltip: ( localize(3509, "Close Editor")),
                         alwaysVisible: isDirty
                     }];
                 })(),