@codingame/monaco-vscode-api 36.2.7 → 37.0.0

package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js

@@ -45,6 +45,7 @@ import { getFlatContextMenuActions } from '../../../../platform/actions/browser/
 import { defaultMenuStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { mainWindow } from '../../../../base/browser/window.js';
 import { ActivityBarPosition } from '../../../services/layout/browser/layoutService.js';
+import { truncateMiddle } from '../../../../base/common/strings.js';
 import Severity$1 from '../../../../base/common/severity.js';
 
 registerCss(menubarControl);
@@ -52,6 +53,9 @@ class MenubarControl extends Disposable {
     static {
         this.MAX_MENU_RECENT_ENTRIES = 10;
     }
+    static {
+        this.MAX_MENU_RECENT_LABEL_LENGTH = 120;
+    }
     constructor(
         menuService,
         workspacesService,
@@ -237,7 +241,7 @@ class MenubarControl extends Disposable {
         }
         const ret = toAction({
             id: commandId,
-            label: unmnemonicLabel(label),
+            label: unmnemonicLabel(truncateMiddle(label, MenubarControl.MAX_MENU_RECENT_LABEL_LENGTH)),
             run: browserEvent => {
                 const openInNewWindow = browserEvent && ((!isMacintosh && (browserEvent.ctrlKey || browserEvent.shiftKey)) || (isMacintosh && (browserEvent.metaKey || browserEvent.altKey)));
                 return this.hostService.openWindow([openable], {
@@ -261,11 +265,11 @@ class MenubarControl extends Disposable {
             return;
         }
         const message = ( localize(
-            3940,
+            4184,
             "Accessibility support is enabled for you. For the most accessible experience, we recommend the custom menu style."
         ));
         this.notificationService.prompt(Severity$1.Info, message, [{
-            label: ( localize(3941, "Open Settings")),
+            label: ( localize(4185, "Open Settings")),
             run: () => {
                 return this.preferencesService.openUserSettings({
                     query: MenuSettings.MenuStyle
@@ -288,7 +292,7 @@ function enableFocusMenuBarAction() {
             constructor() {
                 super({
                     id: `workbench.actions.menubar.focus`,
-                    title: ( localize2(3942, "Focus Application Menu")),
+                    title: ( localize2(4186, "Focus Application Menu")),
                     keybinding: {
                         primary: KeyMod$1.Alt | KeyCode.F10,
                         weight: KeybindingWeight.WorkbenchContrib,
@@ -376,21 +380,21 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
         case StateType.Idle:
             return toAction({
                 id: "update.check",
-                label: ( localize(3943, "Check for &&Updates...")),
+                label: ( localize(4187, "Check for &&Updates...")),
                 enabled: true,
                 run: () => this.updateService.checkForUpdates(true)
             });
         case StateType.CheckingForUpdates:
             return toAction({
                 id: "update.checking",
-                label: ( localize(3944, "Checking for Updates...")),
+                label: ( localize(4188, "Checking for Updates...")),
                 enabled: false,
                 run: () => {}
             });
         case StateType.AvailableForDownload:
             return toAction({
                 id: "update.downloadNow",
-                label: ( localize(3945, "D&&ownload Update")),
+                label: ( localize(4189, "D&&ownload Update")),
                 enabled: true,
                 run: () => this.updateService.downloadUpdate(true)
             });
@@ -398,35 +402,35 @@ let CustomMenubarControl = class CustomMenubarControl extends MenubarControl {
         case StateType.Overwriting:
             return toAction({
                 id: "update.downloading",
-                label: ( localize(3946, "Downloading Update...")),
+                label: ( localize(4190, "Downloading Update...")),
                 enabled: false,
                 run: () => {}
             });
         case StateType.Downloaded:
             return isMacintosh ? null : toAction({
                 id: "update.install",
-                label: ( localize(3947, "Install &&Update...")),
+                label: ( localize(4191, "Install &&Update...")),
                 enabled: true,
                 run: () => this.updateService.applyUpdate()
             });
         case StateType.Updating:
             return toAction({
                 id: "update.updating",
-                label: ( localize(3948, "Installing Update...")),
+                label: ( localize(4192, "Installing Update...")),
                 enabled: false,
                 run: () => {}
             });
         case StateType.Cancelling:
             return toAction({
                 id: "update.cancelling",
-                label: ( localize(3949, "Cancelling Update...")),
+                label: ( localize(4193, "Cancelling Update...")),
                 enabled: false,
                 run: () => {}
             });
         case StateType.Ready:
             return toAction({
                 id: "update.restart",
-                label: ( localize(3950, "Restart to &&Update")),
+                label: ( localize(4194, "Restart to &&Update")),
                 enabled: true,
                 run: () => this.updateService.quitAndInstall()
             });

package/vscode/src/vs/workbench/browser/parts/titlebar/titlebarActions.js

@@ -44,22 +44,22 @@ class ToggleTitleBarConfigAction extends Action2 {
 }
 registerAction2(class ToggleCommandCenter extends ToggleTitleBarConfigAction {
     constructor() {
-        super(LayoutSettings.COMMAND_CENTER, ( localize(3951, "Command Center")), ( localize(3952, "Toggle visibility of the Command Center in title bar")), 1, ( IsCompactTitleBarContext.toNegated()));
+        super(LayoutSettings.COMMAND_CENTER, ( localize(4195, "Command Center")), ( localize(4196, "Toggle visibility of the Command Center in title bar")), 1, ( IsCompactTitleBarContext.toNegated()));
     }
 });
 registerAction2(class ToggleNavigationControl extends ToggleTitleBarConfigAction {
     constructor() {
-        super("workbench.navigationControl.enabled", ( localize(3953, "Navigation Controls")), ( localize(3954, "Toggle visibility of the Navigation Controls in title bar")), 2, ( ContextKeyExpr.and(( IsCompactTitleBarContext.toNegated()), ( ContextKeyExpr.has(`config.${LayoutSettings.COMMAND_CENTER}`)))));
+        super("workbench.navigationControl.enabled", ( localize(4197, "Navigation Controls")), ( localize(4198, "Toggle visibility of the Navigation Controls in title bar")), 2, ( ContextKeyExpr.and(( IsCompactTitleBarContext.toNegated()), ( ContextKeyExpr.has(`config.${LayoutSettings.COMMAND_CENTER}`)))));
     }
 });
 registerAction2(class ToggleLayoutControl extends ToggleTitleBarConfigAction {
     constructor() {
-        super(LayoutSettings.LAYOUT_ACTIONS, ( localize(3955, "Layout Controls")), ( localize(3956, "Toggle visibility of the Layout Controls in title bar")), 4);
+        super(LayoutSettings.LAYOUT_ACTIONS, ( localize(4199, "Layout Controls")), ( localize(4200, "Toggle visibility of the Layout Controls in title bar")), 4);
     }
 });
 registerAction2(class ToggleNotificationsButton extends ToggleTitleBarConfigAction {
     constructor() {
-        super(NotificationsSettings.NOTIFICATIONS_BUTTON, ( localize(3957, "Notifications")), ( localize(3958, "Toggle visibility of the Notifications button in title bar")), 5, ( ContextKeyExpr.equals(
+        super(NotificationsSettings.NOTIFICATIONS_BUTTON, ( localize(4201, "Notifications")), ( localize(4202, "Toggle visibility of the Notifications button in title bar")), 5, ( ContextKeyExpr.equals(
             `config.${NotificationsSettings.NOTIFICATIONS_POSITION}`,
             NotificationsPosition.TOP_RIGHT
         )));
@@ -69,7 +69,7 @@ registerAction2(class ToggleCustomTitleBar extends Action2 {
     constructor() {
         super({
             id: `toggle.${TitleBarSetting.CUSTOM_TITLE_BAR_VISIBILITY}`,
-            title: ( localize(3959, "Hide Custom Title Bar")),
+            title: ( localize(4203, "Hide Custom Title Bar")),
             menu: [{
                 id: MenuId.TitleBarContext,
                 order: 0,
@@ -95,7 +95,7 @@ registerAction2(class ToggleCustomTitleBarWindowed extends Action2 {
     constructor() {
         super({
             id: `toggle.${TitleBarSetting.CUSTOM_TITLE_BAR_VISIBILITY}.windowed`,
-            title: ( localize(3960, "Hide Custom Title Bar In Full Screen")),
+            title: ( localize(4204, "Hide Custom Title Bar In Full Screen")),
             menu: [{
                 id: MenuId.TitleBarContext,
                 order: 1,
@@ -121,7 +121,7 @@ class ToggleCustomTitleBar extends Action2 {
     constructor() {
         super({
             id: `toggle.toggleCustomTitleBar`,
-            title: ( localize(3961, "Custom Title Bar")),
+            title: ( localize(4205, "Custom Title Bar")),
             toggled: TitleBarVisibleContext,
             menu: [{
                 id: MenuId.MenubarAppearanceMenu,
@@ -167,7 +167,7 @@ registerAction2(class ShowCustomTitleBar extends Action2 {
     constructor() {
         super({
             id: `showCustomTitleBar`,
-            title: ( localize2(3962, "Show Custom Title Bar")),
+            title: ( localize2(4206, "Show Custom Title Bar")),
             precondition: ( TitleBarVisibleContext.negate()),
             f1: true
         });
@@ -181,7 +181,7 @@ registerAction2(class HideCustomTitleBar extends Action2 {
     constructor() {
         super({
             id: `hideCustomTitleBar`,
-            title: ( localize2(3963, "Hide Custom Title Bar")),
+            title: ( localize2(4207, "Hide Custom Title Bar")),
             precondition: TitleBarVisibleContext,
             f1: true
         });
@@ -198,7 +198,7 @@ registerAction2(class HideCustomTitleBar extends Action2 {
     constructor() {
         super({
             id: `hideCustomTitleBarInFullScreen`,
-            title: ( localize2(3964, "Hide Custom Title Bar In Full Screen")),
+            title: ( localize2(4208, "Hide Custom Title Bar In Full Screen")),
             precondition: ( ContextKeyExpr.and(TitleBarVisibleContext, IsMainWindowFullscreenContext)),
             f1: true
         });
@@ -219,7 +219,7 @@ registerAction2(class ToggleEditorActions extends Action2 {
         const titleBarContextCondition = ( ContextKeyExpr.and(( ( ContextKeyExpr.equals(`config.workbench.editor.showTabs`, "none")).negate()), ( ContextKeyExpr.equals(`config.${ToggleEditorActions.settingsID}`, "default"))))?.negate();
         super({
             id: `toggle.${ToggleEditorActions.settingsID}`,
-            title: ( localize(3965, "Editor Actions")),
+            title: ( localize(4209, "Editor Actions")),
             toggled: ( ( ContextKeyExpr.equals(`config.${ToggleEditorActions.settingsID}`, "hidden")).negate()),
             menu: [{
                 id: MenuId.TitleBarContext,
@@ -262,16 +262,16 @@ registerAction2(class ToggleEditorActions extends Action2 {
 });
 const ACCOUNTS_ACTIVITY_TILE_ACTION = {
     id: ACCOUNTS_ACTIVITY_ID,
-    label: ( localize(3966, "Accounts")),
-    tooltip: ( localize(3966, "Accounts")),
+    label: ( localize(4210, "Accounts")),
+    tooltip: ( localize(4210, "Accounts")),
     class: undefined,
     enabled: true,
     run: function() {}
 };
 const GLOBAL_ACTIVITY_TITLE_ACTION = {
     id: GLOBAL_ACTIVITY_ID,
-    label: ( localize(3967, "Manage")),
-    tooltip: ( localize(3967, "Manage")),
+    label: ( localize(4211, "Manage")),
+    tooltip: ( localize(4211, "Manage")),
     class: undefined,
     enabled: true,
     run: function() {}

package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js

@@ -52,10 +52,10 @@ let WindowTitle = class WindowTitle extends Disposable {
         WindowTitle_1 = this;
     }
     static {
-        this.NLS_USER_IS_ADMIN = isWindows ? ( localize(3970, "[Administrator]")) : ( localize(3971, "[Superuser]"));
+        this.NLS_USER_IS_ADMIN = isWindows ? ( localize(4214, "[Administrator]")) : ( localize(4215, "[Superuser]"));
     }
     static {
-        this.NLS_EXTENSION_HOST = ( localize(3972, "[Extension Development Host]"));
+        this.NLS_EXTENSION_HOST = ( localize(4216, "[Extension Development Host]"));
     }
     static {
         this.TITLE_DIRTY = "● ";

package/vscode/src/vs/workbench/browser/parts/views/checkbox.js

@@ -83,7 +83,7 @@ class TreeItemCheckbox extends Disposable {
         }
     }
     checkboxHoverContent(checkbox) {
-        return checkbox.tooltip ? checkbox.tooltip : checkbox.isChecked ? ( localize(3973, "Checked")) : ( localize(3974, "Unchecked"));
+        return checkbox.tooltip ? checkbox.tooltip : checkbox.isChecked ? ( localize(4217, "Checked")) : ( localize(4218, "Unchecked"));
     }
     setAccessibilityInformation(checkbox) {
         if (this.toggle && checkbox.accessibilityInformation) {

package/vscode/src/vs/workbench/browser/parts/views/media/views.css

@@ -266,7 +266,7 @@
 	padding-left: 4px;
 }
 
-.customview-tree .monaco-list.horizontal-scrolling .monaco-list-row:has(.monaco-icon-label[class*="monaco-decoration-"]) .actions {
+.customview-tree .monaco-list.horizontal-scrolling .monaco-list-row:has(.monaco-icon-label:is(.monaco-decoration-itemColor, .monaco-decoration-badge)) .actions {
 	right: max(calc(var(--list-scroll-right-offset, 0px) - 17px),
 			0px) !important;
 }

package/vscode/src/vs/workbench/browser/parts/views/treeView.js

@@ -195,7 +195,7 @@ function isTreeCommandEnabled(treeCommand, contextKeyService) {
 function isRenderedMessageValue(messageValue) {
     return !!messageValue && typeof messageValue !== "string" && !!messageValue.element && !!messageValue.disposables;
 }
-const noDataProviderMessage = ( localize(3975, "There is no data provider registered that can provide view data."));
+const noDataProviderMessage = ( localize(4219, "There is no data provider registered that can provide view data."));
 const RawCustomTreeViewContextKey = ( new RawContextKey("customTreeView", false));
 class Tree extends WorkbenchAsyncDataTree {}
 let AbstractTreeView = class AbstractTreeView extends Disposable {
@@ -500,7 +500,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
     }
     initializeShowCollapseAllAction(startingValue = false) {
         if (!this.collapseAllContext) {
-            this.collapseAllContextKey = ( new RawContextKey(`treeView.${this.id}.enableCollapseAll`, startingValue, ( localize(3976, "Whether the tree view with id {0} enables collapse all.", this.id))));
+            this.collapseAllContextKey = ( new RawContextKey(`treeView.${this.id}.enableCollapseAll`, startingValue, ( localize(4220, "Whether the tree view with id {0} enables collapse all.", this.id))));
             this.collapseAllContext = this.collapseAllContextKey.bindTo(this.contextKeyService);
         }
         return true;
@@ -515,7 +515,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
     }
     initializeShowRefreshAction(startingValue = false) {
         if (!this.refreshContext) {
-            this.refreshContextKey = ( new RawContextKey(`treeView.${this.id}.enableRefresh`, startingValue, ( localize(3977, "Whether the tree view with id {0} enables refresh.", this.id))));
+            this.refreshContextKey = ( new RawContextKey(`treeView.${this.id}.enableRefresh`, startingValue, ( localize(4221, "Whether the tree view with id {0} enables refresh.", this.id))));
             this.refreshContext = this.refreshContextKey.bindTo(this.contextKeyService);
         }
     }
@@ -533,7 +533,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
             constructor() {
                 super({
                     id: `workbench.actions.treeView.${that.id}.refresh`,
-                    title: ( localize(3978, "Refresh")),
+                    title: ( localize(4222, "Refresh")),
                     menu: {
                         id: MenuId.ViewTitle,
                         when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("view", that.id)), that.refreshContextKey)),
@@ -551,7 +551,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
             constructor() {
                 super({
                     id: `workbench.actions.treeView.${that.id}.collapseAll`,
-                    title: ( localize(3979, "Collapse All")),
+                    title: ( localize(4223, "Collapse All")),
                     menu: {
                         id: MenuId.ViewTitle,
                         when: ( ContextKeyExpr.and(( ContextKeyExpr.equals("view", that.id)), that.collapseAllContextKey)),
@@ -656,7 +656,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
                             return element.accessibilityInformation.label;
                         }
                         if (isString(element.tooltip)) {
-                            return treeMenus.getResourceActions([element]).length > 0 ? ( localize(3980, "{0}, has actions", element.tooltip)) : element.tooltip;
+                            return treeMenus.getResourceActions([element]).length > 0 ? ( localize(4224, "{0}, has actions", element.tooltip)) : element.tooltip;
                         } else {
                             if (element.resourceUri && !element.label) {
                                 return null;
@@ -670,7 +670,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
                                 buildAriaLabel += element.description;
                             }
                             if (treeMenus.getResourceActions([element]).length > 0) {
-                                buildAriaLabel = buildAriaLabel ? ( localize(3981, "{0}, has actions", buildAriaLabel.trim())) : ( localize(3982, "has actions"));
+                                buildAriaLabel = buildAriaLabel ? ( localize(4225, "{0}, has actions", buildAriaLabel.trim())) : ( localize(4226, "has actions"));
                             }
                             return buildAriaLabel;
                         }
@@ -1047,7 +1047,7 @@ let AbstractTreeView = class AbstractTreeView extends Disposable {
     initializeCollapseAllToggle() {
         if (!this.collapseAllToggleContext) {
             this.collapseAllToggleContextKey = ( new RawContextKey(`treeView.${this.id}.toggleCollapseAll`, false, ( localize(
-                3983,
+                4227,
                 "Whether collapse all is toggled for the tree view with id {0}.",
                 this.id
             ))));
@@ -1451,7 +1451,7 @@ let TreeRenderer = class TreeRenderer extends Disposable {
         });
         if (menuActions.length > 0) {
             const itemName = [label, description].filter(part => !!part).join(" ").trim();
-            templateData.actionBar.setAriaLabel(itemName ? ( localize(3984, "Actions for {0}", itemName)) : ( localize(3985, "Actions")));
+            templateData.actionBar.setAriaLabel(itemName ? ( localize(4228, "Actions for {0}", itemName)) : ( localize(4229, "Actions")));
         } else {
             templateData.actionBar.setAriaLabel("");
         }
@@ -1613,6 +1613,9 @@ class Aligner extends Disposable {
         if (icon) {
             return true;
         }
+        if (node.themeIcon && (!node.resourceUri || (node.themeIcon.id !== FileThemeIcon.id && node.themeIcon.id !== FolderThemeIcon.id))) {
+            return true;
+        }
         if (node.resourceUri || node.themeIcon) {
             const fileIconTheme = this.themeService.getFileIconTheme();
             const isFolder = node.themeIcon ? node.themeIcon.id === FolderThemeIcon.id : node.collapsibleState !== TreeItemCollapsibleState.None;
@@ -1631,7 +1634,7 @@ class MultipleSelectionActionRunner extends ActionRunner {
         this._register(this.onDidRun(e => {
             if (e.error && !isCancellationError(e.error)) {
                 notificationService.error(( localize(
-                    3986,
+                    4230,
                     "Error running command {1}: {0}. This is likely caused by the extension that contributes {1}.",
                     e.error.message,
                     e.action.id

package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js

@@ -37,7 +37,7 @@ const viewFilterMenu = ( new MenuId("menu.view.filter"));
 const viewFilterSubmenu = ( new MenuId("submenu.view.filter"));
 MenuRegistry.appendMenuItem(viewFilterMenu, {
     submenu: viewFilterSubmenu,
-    title: ( localize(3987, "More Filters...")),
+    title: ( localize(4231, "More Filters...")),
     group: "navigation",
     icon: Codicon.filter
 });
@@ -113,15 +113,15 @@ let FilterWidget = class FilterWidget extends Widget {
         this.filterInputBox.focus();
     }
     _updateFilterInputAriaLabel() {
-        let ariaLabel = this.options.ariaLabel || ( localize(3988, "Filter"));
+        let ariaLabel = this.options.ariaLabel || ( localize(4232, "Filter"));
         if (!this._accessibilityHelpHintAnnounced && this.configurationService.getValue("accessibility.verbosity.find") && this.accessibilityService.isScreenReaderOptimized()) {
             const keybinding = this.keybindingService.lookupKeybinding("editor.action.accessibilityHelp")?.getAriaLabel();
             if (keybinding) {
-                ariaLabel += ", " + ( localize(3989, "Press {0} for accessibility help", keybinding));
+                ariaLabel += ", " + ( localize(4233, "Press {0} for accessibility help", keybinding));
                 this._accessibilityHelpHintAnnounced = true;
                 this._labelResetTimeout?.dispose();
                 this._labelResetTimeout = disposableTimeout(() => {
-                    this.filterInputBox.setAriaLabel(this.options.ariaLabel || ( localize(3988, "Filter")));
+                    this.filterInputBox.setAriaLabel(this.options.ariaLabel || ( localize(4232, "Filter")));
                 }, 1000);
             }
         }

package/vscode/src/vs/workbench/browser/parts/views/viewPane.js

@@ -69,8 +69,8 @@ var ViewPaneShowActions;
     ViewPaneShowActions[ViewPaneShowActions["Always"] = 2] = "Always";
 })(ViewPaneShowActions || (ViewPaneShowActions = {}));
 const VIEWPANE_FILTER_ACTION = ( new Action("viewpane.action.filter"));
-const viewPaneContainerExpandedIcon = registerIcon("view-pane-container-expanded", Codicon.chevronDown, ( localize(3990, "Icon for an expanded view pane container.")));
-const viewPaneContainerCollapsedIcon = registerIcon("view-pane-container-collapsed", Codicon.chevronRight, ( localize(3991, "Icon for a collapsed view pane container.")));
+const viewPaneContainerExpandedIcon = registerIcon("view-pane-container-expanded", Codicon.chevronDown, ( localize(4234, "Icon for an expanded view pane container.")));
+const viewPaneContainerCollapsedIcon = registerIcon("view-pane-container-collapsed", Codicon.chevronRight, ( localize(4235, "Icon for a collapsed view pane container.")));
 const viewsRegistry = ( Registry.as(Extensions.ViewsRegistry));
 let ViewWelcomeController = class ViewWelcomeController {
     get enabled() {
@@ -132,7 +132,7 @@ let ViewWelcomeController = class ViewWelcomeController {
         this.element = $(".welcome-view-content", {
             tabIndex: 0,
             role: "region",
-            "aria-label": ( localize(3992, "Welcome"))
+            "aria-label": ( localize(4236, "Welcome"))
         });
         if (this._wide) {
             this.element.classList.add("wide");
@@ -418,7 +418,7 @@ let ViewPane = class ViewPane extends Pane {
                 }
                 return item;
             },
-            ariaLabel: ( localize(3993, "{0} actions", this.title)),
+            ariaLabel: ( localize(4237, "{0} actions", this.title)),
             getKeyBinding: action => this.keybindingService.lookupKeybinding(action.id),
             renderDropdownAsChildElement: true,
             actionRunner: this.getActionRunner(),
@@ -518,7 +518,7 @@ let ViewPane = class ViewPane extends Pane {
                 return title;
             }
         }
-        return localize(3994, "Use Alt+F1 for accessibility help {0}", title);
+        return localize(4238, "Use Alt+F1 for accessibility help {0}", title);
     }
     updateTitle(title) {
         const calculatedTitle = this.calculateTitle(title);

package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js

@@ -45,7 +45,7 @@ import { IViewDescriptorService } from '../../../common/views.service.js';
 import { IViewsService } from '../../../services/views/common/viewsService.service.js';
 import { FocusedViewContext } from '../../../common/contextkeys.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
-import { LayoutSettings, isHorizontal, FLOATING_PANEL_MARGIN } from '../../../services/layout/browser/layoutService.js';
+import { LayoutSettings, isHorizontal, Position, getFloatingPanelMargin } from '../../../services/layout/browser/layoutService.js';
 import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
 import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { ViewContainerMenuActions } from './viewMenuActions.js';
@@ -54,7 +54,7 @@ registerCss(paneviewlet);
 const ViewsSubMenu = ( new MenuId("Views"));
 MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     submenu: ViewsSubMenu,
-    title: ( localize(3995, "Views")),
+    title: ( localize(4239, "Views")),
     order: 1
 });
 var DropDirection;
@@ -555,7 +555,7 @@ let ViewPaneContainer = class ViewPaneContainer extends Component {
             if (this.paneview.orientation !== this.orientation) {
                 this.paneview.flipOrientation(dimension.height, dimension.width);
             }
-            const bottomGap = this.layoutService.isFloatingPanelsEnabled() ? FLOATING_PANEL_MARGIN + 1 : 0;
+            const bottomGap = !this.layoutService.isFloatingPanelsEnabled() ? 0 : (this.viewDescriptorService.getViewContainerLocation(this.viewContainer) === ViewContainerLocation.Panel && this.layoutService.getPanelPosition() === Position.TOP) ? 1 : getFloatingPanelMargin(this.layoutService) + 1;
             this.paneview.layout(Math.max(0, dimension.height - bottomGap), dimension.width);
         }
         this.dimension = dimension;
@@ -1116,7 +1116,7 @@ registerAction2(class MoveViewUp extends MoveViewPosition {
     constructor() {
         super({
             id: "views.moveViewUp",
-            title: ( localize(3996, "Move View Up")),
+            title: ( localize(4240, "Move View Up")),
             keybinding: {
                 primary: KeyChord(KeyMod$1.CtrlCmd + KeyCode.KeyK, KeyCode.UpArrow),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
@@ -1129,7 +1129,7 @@ registerAction2(class MoveViewLeft extends MoveViewPosition {
     constructor() {
         super({
             id: "views.moveViewLeft",
-            title: ( localize(3997, "Move View Left")),
+            title: ( localize(4241, "Move View Left")),
             keybinding: {
                 primary: KeyChord(KeyMod$1.CtrlCmd + KeyCode.KeyK, KeyCode.LeftArrow),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
@@ -1142,7 +1142,7 @@ registerAction2(class MoveViewDown extends MoveViewPosition {
     constructor() {
         super({
             id: "views.moveViewDown",
-            title: ( localize(3998, "Move View Down")),
+            title: ( localize(4242, "Move View Down")),
             keybinding: {
                 primary: KeyChord(KeyMod$1.CtrlCmd + KeyCode.KeyK, KeyCode.DownArrow),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
@@ -1155,7 +1155,7 @@ registerAction2(class MoveViewRight extends MoveViewPosition {
     constructor() {
         super({
             id: "views.moveViewRight",
-            title: ( localize(3999, "Move View Right")),
+            title: ( localize(4243, "Move View Right")),
             keybinding: {
                 primary: KeyChord(KeyMod$1.CtrlCmd + KeyCode.KeyK, KeyCode.RightArrow),
                 weight: KeybindingWeight.WorkbenchContrib + 1,
@@ -1168,7 +1168,7 @@ registerAction2(class MoveViews extends Action2 {
     constructor() {
         super({
             id: "vscode.moveViews",
-            title: ( localize(4000, "Move Views"))
+            title: ( localize(4244, "Move Views"))
         });
     }
     async run(accessor, options) {

package/vscode/src/vs/workbench/browser/quickaccess.js

@@ -10,7 +10,7 @@ import { IEditorGroupsService } from '../services/editor/common/editorGroupsServ
 import { IEditorService } from '../services/editor/common/editorService.service.js';
 
 const inQuickPickContextKeyValue = "inQuickOpen";
-const InQuickPickContextKey = ( new RawContextKey(inQuickPickContextKeyValue, false, ( localize(4001, "Whether keyboard focus is inside the quick open control"))));
+const InQuickPickContextKey = ( new RawContextKey(inQuickPickContextKeyValue, false, ( localize(4245, "Whether keyboard focus is inside the quick open control"))));
 const inQuickPickContext = ( ContextKeyExpr.has(inQuickPickContextKeyValue));
 const defaultQuickAccessContextKeyValue = "inFilesPicker";
 const defaultQuickAccessContext = ( ContextKeyExpr.and(inQuickPickContext, ( ContextKeyExpr.has(defaultQuickAccessContextKeyValue))));

package/vscode/src/vs/workbench/browser/web.api.d.ts

@@ -218,6 +218,12 @@ export interface IWorkbenchConstructionOptions {
      * List of extensions to be disabled if they are installed.
      */
     readonly disabledExtensions?: boolean | string[];
+    /**
+     * List of extensions allowed to use proposed APIs in this session.
+     * This is the equivalent of the `--enable-proposed-api` command line flag.
+     * An empty array enables proposed APIs for all extensions.
+     */
+    readonly enabledExtensionProposedApi?: readonly ExtensionId[];
     /**
      * Additional domains allowed to open from the workbench without the
      * link protection popup.
@@ -414,6 +420,10 @@ export interface ITunnelDiscoveryProvider {
      * @param clusterId The cluster region of the tunnel.
      */
     connect(tunnelId: string, clusterId: string): Promise<ITunnelConnection>;
+    /**
+     * Delete a tunnel from the embedder's backing tunnel service.
+     */
+    deleteTunnel?(tunnelId: string, clusterId: string): Promise<void>;
 }
 /**
  * A bidirectional message-passing connection to a tunnel's agent host.