@codingame/monaco-vscode-api 34.1.2 → 35.0.0

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

@@ -17,7 +17,7 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { GroupOrientation, GroupsOrder, GroupLocation, GroupsArrangement, GroupActivationReason, GroupDirection, MergeGroupMode } from '../../../services/editor/common/editorGroupsService.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { isGridBranchNode, createSerializedGrid, Sizing, Direction, SerializableGrid } from '../../../../base/browser/ui/grid/grid.js';
+import { Direction, isGridBranchNode, createSerializedGrid, Sizing, SerializableGrid } from '../../../../base/browser/ui/grid/grid.js';
 import { GroupModelChangeKind } from '../../../common/editor.js';
 import { EDITOR_GROUP_BORDER, EDITOR_PANE_BACKGROUND } from '../../../common/theme.js';
 import { coalesce, distinct } from '../../../../base/common/arrays.js';
@@ -32,7 +32,7 @@ import { EditorDropTarget } from './editorDropTarget.js';
 import { Color } from '../../../../base/common/color.js';
 import { CenteredViewLayout } from '../../../../base/browser/ui/centered/centeredViewLayout.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
-import { Parts, Position } from '../../../services/layout/browser/layoutService.js';
+import { Parts, Position, getFloatingOuterEdgeOwners, FLOATING_PANEL_MARGIN } from '../../../services/layout/browser/layoutService.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
 import { assertType } from '../../../../base/common/types.js';
 import { CompositeDragAndDropObserver } from '../../dnd.js';
@@ -49,6 +49,7 @@ import { orthogonal } from '../../../../base/browser/ui/grid/gridview.js';
 import { Orientation } from '../../../../base/browser/ui/sash/sash.js';
 
 var EditorPart_1;
+const EDITOR_FRAME_BORDER_WIDTH = 1;
 class GridWidgetView {
     constructor() {
         this.element = $(".grid-view-container");
@@ -161,6 +162,7 @@ let EditorPart = class EditorPart extends Part {
         this.enforcedPartOptions = [];
         this.top = 0;
         this.left = 0;
+        this._contentRightInset = 0;
         this.sideGroup = {
             openEditor: async (editor, options) => {
                 const findGroupResult = this.scopedInstantiationService.invokeFunction(accessor => findGroup(accessor, {
@@ -230,6 +232,22 @@ let EditorPart = class EditorPart extends Part {
     get contentDimension() {
         return this._contentDimension;
     }
+    setContentRightInset(inset) {
+        this._contentRightInset = Math.max(0, Math.round(inset));
+        this.applyContentRightInset();
+    }
+    applyContentRightInset() {
+        if (!this.gridWidget) {
+            return;
+        }
+        for (const group of ( this.groupViews.values())) {
+            if (!(group instanceof EditorGroupView)) {
+                continue;
+            }
+            const atRightEdge = this._contentRightInset > 0 && this.gridWidget.getNeighborViews(group, Direction.Right).length === 0;
+            group.setContentRightInset(atRightEdge ? this._contentRightInset : 0);
+        }
+    }
     get activeGroup() {
         return this._activeGroup;
     }
@@ -886,14 +904,22 @@ let EditorPart = class EditorPart extends Part {
         this._register(this.onDidAddGroup(() => {
             updateContextKeys();
             updateTopRightGroupContextKey();
+            this.applyContentRightInset();
         }));
         this._register(this.onDidRemoveGroup(() => {
             updateContextKeys();
             updateTopRightGroupContextKey();
+            this.applyContentRightInset();
+        }));
+        this._register(this.onDidChangeGroupMaximized(() => {
+            updateContextKeys();
+            this.applyContentRightInset();
         }));
-        this._register(this.onDidChangeGroupMaximized(() => updateContextKeys()));
         this._register(this.onDidChangeEditorPartOptions(() => updateEditorTabsVisibleContext()));
-        this._register(this.onDidMoveGroup(() => updateTopRightGroupContextKey()));
+        this._register(this.onDidMoveGroup(() => {
+            updateTopRightGroupContextKey();
+            this.applyContentRightInset();
+        }));
         this._register(this.onDidLayout(() => updateTopRightGroupContextKey()));
     }
     setupDragAndDropSupport(parent, container) {
@@ -1084,9 +1110,40 @@ let EditorPart = class EditorPart extends Part {
     layout(width, height, top, left) {
         this.top = top;
         this.left = left;
+        if (this.windowId === mainWindow.vscodeWindowId && this.layoutService.isFloatingPanelsEnabled()) {
+            const owners = getFloatingOuterEdgeOwners(this.layoutService);
+            const outerLeft = owners.left === Parts.EDITOR_PART;
+            const outerRight = owners.right === Parts.EDITOR_PART;
+            const leftMargin = outerLeft ? FLOATING_PANEL_MARGIN * 2 : FLOATING_PANEL_MARGIN;
+            const rightMargin = outerRight ? FLOATING_PANEL_MARGIN * 2 : FLOATING_PANEL_MARGIN;
+            width = Math.max(0, width - leftMargin - rightMargin);
+            const {
+                topMargin,
+                bottomMargin
+            } = this.getFloatingPanelHeightInsets();
+            height = Math.max(0, height - topMargin - bottomMargin);
+            if (!this.element.classList.contains("modal-editor-part")) {
+                width = Math.max(0, width - EDITOR_FRAME_BORDER_WIDTH * 2);
+                height = Math.max(0, height - EDITOR_FRAME_BORDER_WIDTH * 2);
+            }
+            this.element.classList.toggle("floating-editor-outer-left", outerLeft);
+            this.element.classList.toggle("floating-editor-outer-right", outerRight);
+        } else {
+            this.element.classList.remove("floating-editor-outer-left", "floating-editor-outer-right");
+        }
         const contentAreaSize = super.layoutContents(width, height).contentSize;
         this.doLayout(Dimension.lift(contentAreaSize), top, left);
     }
+    getFloatingPanelHeightInsets() {
+        const panelVisible = this.layoutService.isVisible(Parts.PANEL_PART);
+        const panelAtTop = panelVisible && this.layoutService.getPanelPosition() === Position.TOP;
+        const panelAtBottom = panelVisible && this.layoutService.getPanelPosition() === Position.BOTTOM;
+        const bottomMargin = !this.layoutService.isVisible(Parts.STATUSBAR_PART, mainWindow) && !panelAtBottom ? FLOATING_PANEL_MARGIN * 2 : FLOATING_PANEL_MARGIN;
+        return {
+            topMargin: panelAtTop ? FLOATING_PANEL_MARGIN : 0,
+            bottomMargin
+        };
+    }
     doLayout(dimension, top = this.top, left = this.left) {
         this._contentDimension = dimension;
         this.centeredLayoutWidget.layout(this._contentDimension.width, this._contentDimension.height, top, left);
@@ -1165,7 +1222,9 @@ let EditorPart = class EditorPart extends Part {
     }
     doApplyGridState(gridState, activeGroupId, editorGroupViewsToReuse, options) {
         this.doCreateGridControlWithState(gridState, activeGroupId, editorGroupViewsToReuse, options);
-        this.doLayout(this._contentDimension);
+        if (this._contentDimension) {
+            this.doLayout(this._contentDimension);
+        }
         this.updateContainer();
         for (const groupView of this.getGroups(GroupsOrder.GRID_APPEARANCE)) {
             if (!editorGroupViewsToReuse?.includes(groupView)) {

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

@@ -241,7 +241,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         }
     }
     getGroupsLabel(index) {
-        return localize(3618, "Window {0}", index + 1);
+        return localize(3694, "Window {0}", index + 1);
     }
     getPartByDocument(document) {
         const mruParts = this.mostRecentActiveParts;

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(3619, "Workspace Trust Required"));
+        this.LABEL = ( localize(3695, "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(
-                3620,
+                3696,
                 "The file is not displayed in the editor because trust has not been granted to the folder."
             )) : ( localize(
-                3621,
+                3697,
                 "The file is not displayed in the editor because trust has not been granted to the workspace."
             )),
             actions: [{
-                label: ( localize(3622, "Manage Workspace Trust")),
+                label: ( localize(3698, "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(3623, "Error Editor"));
+        this.LABEL = ( localize(3699, "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(3624, "The editor could not be opened because the file was not found."));
+            label = ( localize(3700, "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(
-                3625,
+                3701,
                 "The editor could not be opened due to an unexpected error. Please consult the log for more details."
             ));
         } else {
-            label = ( localize(3626, "The editor could not be opened due to an unexpected error."));
+            label = ( localize(3702, "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(3627, "Try Again")),
+                label: ( localize(3703, "Try Again")),
                 run: () => this.group.openEditor(input, {
                     ...options,
                     source: EditorOpenSource.USER
                 })
             }, {
-                label: ( localize(3628, "Show Logs")),
+                label: ( localize(3704, "Show Logs")),
                 run: () => this.commandService.executeCommand(showWindowLogActionId)
             }];
         }

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

@@ -24,7 +24,7 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
         super(prefix, {
             canAcceptInBackground: true,
             noResultsPick: {
-                label: ( localize(3629, "No matching editors")),
+                label: ( localize(3705, "No matching editors")),
                 groupId: -1
             }
         });
@@ -141,18 +141,18 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
                 ariaLabel: (() => {
                     if (mapGroupIdToGroupAriaLabel.size > 1) {
                         return isDirty ? ( localize(
-                            3630,
+                            3706,
                             "{0}, unsaved changes, {1}",
                             nameAndDescription,
                             mapGroupIdToGroupAriaLabel.get(groupId)
                         )) : ( localize(
-                            3631,
+                            3707,
                             "{0}, {1}",
                             nameAndDescription,
                             mapGroupIdToGroupAriaLabel.get(groupId)
                         ));
                     }
-                    return isDirty ? ( localize(3632, "{0}, unsaved changes", nameAndDescription)) : nameAndDescription;
+                    return isDirty ? ( localize(3708, "{0}, unsaved changes", nameAndDescription)) : nameAndDescription;
                 })(),
                 description,
                 iconPath: URI.isUri(icon) ? {
@@ -163,7 +163,7 @@ let BaseEditorQuickAccessProvider = class BaseEditorQuickAccessProvider extends
                 buttons: (() => {
                     return [{
                         iconClass: isDirty ? ("dirty-editor " + ThemeIcon.asClassName(Codicon.closeDirty)) : ThemeIcon.asClassName(Codicon.close),
-                        tooltip: ( localize(3633, "Close Editor")),
+                        tooltip: ( localize(3709, "Close Editor")),
                         alwaysVisible: isDirty
                     }];
                 })(),