@codingame/monaco-vscode-api 1.85.0 → 1.85.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-api",
-  "version": "1.85.0",
+  "version": "1.85.1",
   "description": "VSCode public API plugged on the monaco editor",
   "keywords": [],
   "author": {
@@ -100,10 +100,10 @@
   "dependencies": {
     "monaco-editor": "0.45.0",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-layout-service-override": "1.85.0",
-    "@codingame/monaco-vscode-environment-service-override": "1.85.0",
-    "@codingame/monaco-vscode-extensions-service-override": "1.85.0",
-    "@codingame/monaco-vscode-files-service-override": "1.85.0",
-    "@codingame/monaco-vscode-quickaccess-service-override": "1.85.0"
+    "@codingame/monaco-vscode-extensions-service-override": "1.85.1",
+    "@codingame/monaco-vscode-files-service-override": "1.85.1",
+    "@codingame/monaco-vscode-layout-service-override": "1.85.1",
+    "@codingame/monaco-vscode-environment-service-override": "1.85.1",
+    "@codingame/monaco-vscode-quickaccess-service-override": "1.85.1"
   }
 }

package/vscode/src/vs/base/common/jsonFormatter.js

@@ -140,6 +140,13 @@ function format(documentText, range, options) {
     }
     return editOperations;
 }
+function toFormattedString(obj, options) {
+    const content = JSON.stringify(obj, undefined, options.insertSpaces ? options.tabSize || 4 : '\t');
+    if (options.eol !== undefined) {
+        return content.replace(/\r\n|\r|\n/g, options.eol);
+    }
+    return content;
+}
 function repeat(s, count) {
     let result = '';
     for (let i = 0; i < count; i++) {
@@ -184,4 +191,4 @@ function getEOL(options, text) {
 function isEOL(text, offset) {
     return '\r\n'.indexOf(text.charAt(offset)) !== -1;
 }
-export { format, getEOL, isEOL };
+export { format, getEOL, isEOL, toFormattedString };

package/vscode/src/vs/platform/actions/browser/buttonbar.js

@@ -0,0 +1,128 @@
+import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
+import { ButtonBar } from 'monaco-editor/esm/vs/base/browser/ui/button/button.js';
+import { ActionRunner, SubmenuAction } from 'monaco-editor/esm/vs/base/common/actions.js';
+import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
+import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { MenuItemAction, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
+import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
+import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+let WorkbenchButtonBar = class WorkbenchButtonBar extends ButtonBar {
+    constructor(container, _options, _contextMenuService, _keybindingService, telemetryService) {
+        super(container);
+        this._options = _options;
+        this._contextMenuService = _contextMenuService;
+        this._keybindingService = _keybindingService;
+        this._store = ( new DisposableStore());
+        this._onDidChange = ( new Emitter());
+        this.onDidChange = this._onDidChange.event;
+        this._actionRunner = this._store.add(( new ActionRunner()));
+        if (_options?.telemetrySource) {
+            this._actionRunner.onDidRun(e => {
+                telemetryService.publicLog2('workbenchActionExecuted', { id: e.action.id, from: _options.telemetrySource });
+            }, undefined, this._store);
+        }
+    }
+    dispose() {
+        this._onDidChange.dispose();
+        this._store.dispose();
+        super.dispose();
+    }
+    update(actions) {
+        const conifgProvider = this._options?.buttonConfigProvider ?? (() => ({ showLabel: true }));
+        this.clear();
+        for (let i = 0; i < actions.length; i++) {
+            const secondary = i > 0;
+            const actionOrSubmenu = actions[i];
+            let action;
+            let btn;
+            if (actionOrSubmenu instanceof SubmenuAction && actionOrSubmenu.actions.length > 0) {
+                const [first, ...rest] = actionOrSubmenu.actions;
+                action = first;
+                btn = this.addButtonWithDropdown({
+                    secondary: conifgProvider(action)?.isSecondary ?? secondary,
+                    actionRunner: this._actionRunner,
+                    actions: rest,
+                    contextMenuProvider: this._contextMenuService,
+                });
+            }
+            else {
+                action = actionOrSubmenu;
+                btn = this.addButton({
+                    secondary: conifgProvider(action)?.isSecondary ?? secondary,
+                });
+            }
+            btn.enabled = action.enabled;
+            btn.element.classList.add('default-colors');
+            if (conifgProvider(action)?.showLabel ?? true) {
+                btn.label = action.label;
+            }
+            else {
+                btn.element.classList.add('monaco-text-button');
+            }
+            if (conifgProvider(action)?.showIcon) {
+                if (action instanceof MenuItemAction && ThemeIcon.isThemeIcon(action.item.icon)) {
+                    btn.icon = action.item.icon;
+                }
+                else if (action.class) {
+                    btn.element.classList.add(...action.class.split(' '));
+                }
+            }
+            const kb = this._keybindingService.lookupKeybinding(action.id);
+            if (kb) {
+                btn.element.title = ( localizeWithPath(
+                    'vs/platform/actions/browser/buttonbar',
+                    'labelWithKeybinding',
+                    "{0} ({1})",
+                    action.label,
+                    kb.getLabel()
+                ));
+            }
+            else {
+                btn.element.title = action.label;
+            }
+            btn.onDidClick(async () => {
+                this._actionRunner.run(action);
+            });
+        }
+        this._onDidChange.fire(this);
+    }
+};
+WorkbenchButtonBar = ( __decorate([
+    ( __param(2, IContextMenuService)),
+    ( __param(3, IKeybindingService)),
+    ( __param(4, ITelemetryService))
+], WorkbenchButtonBar));
+let MenuWorkbenchButtonBar = class MenuWorkbenchButtonBar extends WorkbenchButtonBar {
+    constructor(container, menuId, options, menuService, contextKeyService, contextMenuService, keybindingService, telemetryService) {
+        super(container, options, contextMenuService, keybindingService, telemetryService);
+        const menu = menuService.createMenu(menuId, contextKeyService);
+        this._store.add(menu);
+        const update = () => {
+            this.clear();
+            const actions = menu
+                .getActions({ renderShortTitle: true })
+                .flatMap(entry => entry[1]);
+            super.update(actions);
+        };
+        this._store.add(menu.onDidChange(update));
+        update();
+    }
+    dispose() {
+        super.dispose();
+    }
+    update(_actions) {
+        throw new Error('Use Menu or WorkbenchButtonBar');
+    }
+};
+MenuWorkbenchButtonBar = ( __decorate([
+    ( __param(3, IMenuService)),
+    ( __param(4, IContextKeyService)),
+    ( __param(5, IContextMenuService)),
+    ( __param(6, IKeybindingService)),
+    ( __param(7, ITelemetryService))
+], MenuWorkbenchButtonBar));
+export { MenuWorkbenchButtonBar, WorkbenchButtonBar };

package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js

@@ -3,6 +3,7 @@ import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/com
 const EXTENSION_IDENTIFIER_PATTERN = '^([a-z0-9A-Z][a-z0-9-A-Z]*)\\.([a-z0-9A-Z][a-z0-9-A-Z]*)$';
 const EXTENSION_IDENTIFIER_REGEX = ( new RegExp(EXTENSION_IDENTIFIER_PATTERN));
 const WEB_EXTENSION_TAG = '__web_extension';
+const EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT = 'skipWalkthrough';
 const EXTENSION_INSTALL_SYNC_CONTEXT = 'extensionsSync';
 const EXTENSION_INSTALL_DEP_PACK_CONTEXT = 'dependecyOrPackExtensionInstall';
 function TargetPlatformToString(targetPlatform) {
@@ -141,4 +142,4 @@ const PreferencesLocalizedLabel = { value: ( localizeWithPath(
     'preferences',
     "Preferences"
 )), original: 'Preferences' };
-export { DISABLED_EXTENSIONS_STORAGE_PATH, ENABLED_EXTENSIONS_STORAGE_PATH, EXTENSION_IDENTIFIER_PATTERN, EXTENSION_IDENTIFIER_REGEX, EXTENSION_INSTALL_DEP_PACK_CONTEXT, EXTENSION_INSTALL_SYNC_CONTEXT, ExtensionManagementError, ExtensionManagementErrorCode, ExtensionsLabel, ExtensionsLocalizedLabel, IExtensionGalleryService, IExtensionManagementService, IExtensionTipsService, IGlobalExtensionEnablementService, PreferencesLocalizedLabel, TargetPlatformToString, WEB_EXTENSION_TAG, getTargetPlatform, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, toTargetPlatform };
+export { DISABLED_EXTENSIONS_STORAGE_PATH, ENABLED_EXTENSIONS_STORAGE_PATH, EXTENSION_IDENTIFIER_PATTERN, EXTENSION_IDENTIFIER_REGEX, EXTENSION_INSTALL_DEP_PACK_CONTEXT, EXTENSION_INSTALL_SKIP_WALKTHROUGH_CONTEXT, EXTENSION_INSTALL_SYNC_CONTEXT, ExtensionManagementError, ExtensionManagementErrorCode, ExtensionsLabel, ExtensionsLocalizedLabel, IExtensionGalleryService, IExtensionManagementService, IExtensionTipsService, IGlobalExtensionEnablementService, PreferencesLocalizedLabel, TargetPlatformToString, WEB_EXTENSION_TAG, getTargetPlatform, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, toTargetPlatform };

package/vscode/src/vs/platform/layout/browser/zIndexRegistry.js

@@ -0,0 +1,58 @@
+import { createStyleSheet, clearNode, createCSSRule } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { RunOnceScheduler } from 'monaco-editor/esm/vs/base/common/async.js';
+var ZIndex;
+( (function(ZIndex) {
+    ZIndex[ZIndex["Base"] = 0] = "Base";
+    ZIndex[ZIndex["Sash"] = 35] = "Sash";
+    ZIndex[ZIndex["SuggestWidget"] = 40] = "SuggestWidget";
+    ZIndex[ZIndex["Hover"] = 50] = "Hover";
+    ZIndex[ZIndex["DragImage"] = 1000] = "DragImage";
+    ZIndex[ZIndex["MenubarMenuItemsHolder"] = 2000] = "MenubarMenuItemsHolder";
+    ZIndex[ZIndex["ContextView"] = 2500] = "ContextView";
+    ZIndex[ZIndex["ModalDialog"] = 2600] = "ModalDialog";
+    ZIndex[ZIndex["PaneDropOverlay"] = 10000] = "PaneDropOverlay";
+})(ZIndex || (ZIndex = {})));
+const ZIndexValues = ( ( Object.keys(ZIndex)).filter(key => !isNaN(Number(key))).map(key => Number(key))).sort((a, b) => b - a);
+function findBase(z) {
+    for (const zi of ZIndexValues) {
+        if (z >= zi) {
+            return zi;
+        }
+    }
+    return -1;
+}
+class ZIndexRegistry {
+    constructor() {
+        this.styleSheet = createStyleSheet();
+        this.zIndexMap = ( new Map());
+        this.scheduler = ( new RunOnceScheduler(() => this.updateStyleElement(), 200));
+    }
+    registerZIndex(relativeLayer, z, name) {
+        if (this.zIndexMap.get(name)) {
+            throw new Error(`z-index with name ${name} has already been registered.`);
+        }
+        const proposedZValue = relativeLayer + z;
+        if (findBase(proposedZValue) !== relativeLayer) {
+            throw new Error(`Relative layer: ${relativeLayer} + z-index: ${z} exceeds next layer ${proposedZValue}.`);
+        }
+        this.zIndexMap.set(name, proposedZValue);
+        this.scheduler.schedule();
+        return this.getVarName(name);
+    }
+    getVarName(name) {
+        return `--z-index-${name}`;
+    }
+    updateStyleElement() {
+        clearNode(this.styleSheet);
+        let ruleBuilder = '';
+        this.zIndexMap.forEach((zIndex, name) => {
+            ruleBuilder += `${this.getVarName(name)}: ${zIndex};\n`;
+        });
+        createCSSRule(':root', ruleBuilder, this.styleSheet);
+    }
+}
+const zIndexRegistry = ( new ZIndexRegistry());
+function registerZIndex(relativeLayer, z, name) {
+    return zIndexRegistry.registerZIndex(relativeLayer, z, name);
+}
+export { ZIndex, registerZIndex };

package/vscode/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.js

@@ -645,7 +645,62 @@ let WindowsPtyHeuristics = class WindowsPtyHeuristics extends Disposable {
 WindowsPtyHeuristics = ( __decorate([
     ( __param(3, ILogService))
 ], WindowsPtyHeuristics));
+function getLinesForCommand(buffer, command, cols, outputMatcher) {
+    if (!outputMatcher) {
+        return undefined;
+    }
+    const executedMarker = command.executedMarker;
+    const endMarker = command.endMarker;
+    if (!executedMarker || !endMarker) {
+        return undefined;
+    }
+    const startLine = executedMarker.line;
+    const endLine = endMarker.line;
+    const linesToCheck = outputMatcher.length;
+    const lines = [];
+    if (outputMatcher.anchor === 'bottom') {
+        for (let i = endLine - (outputMatcher.offset || 0); i >= startLine; i--) {
+            let wrappedLineStart = i;
+            const wrappedLineEnd = i;
+            while (wrappedLineStart >= startLine && buffer.getLine(wrappedLineStart)?.isWrapped) {
+                wrappedLineStart--;
+            }
+            i = wrappedLineStart;
+            lines.unshift(getXtermLineContent(buffer, wrappedLineStart, wrappedLineEnd, cols));
+            if (lines.length > linesToCheck) {
+                lines.pop();
+            }
+        }
+    }
+    else {
+        for (let i = startLine + (outputMatcher.offset || 0); i < endLine; i++) {
+            const wrappedLineStart = i;
+            let wrappedLineEnd = i;
+            while (wrappedLineEnd + 1 < endLine && buffer.getLine(wrappedLineEnd + 1)?.isWrapped) {
+                wrappedLineEnd++;
+            }
+            i = wrappedLineEnd;
+            lines.push(getXtermLineContent(buffer, wrappedLineStart, wrappedLineEnd, cols));
+            if (lines.length === linesToCheck) {
+                lines.shift();
+            }
+        }
+    }
+    return lines;
+}
+function getXtermLineContent(buffer, lineStart, lineEnd, cols) {
+    const maxLineLength = Math.max(2048 / cols * 2);
+    lineEnd = Math.min(lineEnd, lineStart + maxLineLength);
+    let content = '';
+    for (let i = lineStart; i <= lineEnd; i++) {
+        const line = buffer.getLine(i);
+        if (line) {
+            content += line.translateToString(true, 0, cols);
+        }
+    }
+    return content;
+}
 function cloneMarker(xterm, marker, offset = 0) {
     return xterm.registerMarker(marker.line - (xterm.buffer.active.baseY + xterm.buffer.active.cursorY) + offset);
 }
-export { CommandDetectionCapability };
+export { CommandDetectionCapability, getLinesForCommand };

package/vscode/src/vs/workbench/browser/actions/layoutActions.js

@@ -1,5 +1,5 @@
 import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { registerAction2, Action2, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { registerAction2, Action2, MenuId, MenuRegistry } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
 import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
 import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
 import { IWorkbenchLayoutService, positionToString } from '../../services/layout/browser/layoutService.js';
@@ -9,7 +9,7 @@ import { isWindows, isLinux, isWeb, isMacintosh, isNative } from 'monaco-editor/
 import { IsMacNativeContext } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkeys.js';
 import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
 import { ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { IViewDescriptorService, IViewsService } from '../../common/views.js';
+import { ViewContainerLocationToString, IViewDescriptorService, IViewsService } from '../../common/views.js';
 import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
 import '../../../../../../override/vs/platform/dialogs/common/dialogs.js';
 import { IPaneCompositePartService } from '../../services/panecomposite/browser/panecomposite.js';
@@ -43,7 +43,7 @@ const panelLeftIcon = registerIcon('panel-left', Codicon.layoutSidebarLeft, ( lo
     'panelLeft',
     "Represents a side bar in the left position"
 )));
-registerIcon('panel-left-off', Codicon.layoutSidebarLeftOff, ( localizeWithPath(
+const panelLeftOffIcon = registerIcon('panel-left-off', Codicon.layoutSidebarLeftOff, ( localizeWithPath(
     'vs/workbench/browser/actions/layoutActions',
     'panelLeftOff',
     "Represents a side bar in the left position toggled off"
@@ -53,7 +53,7 @@ const panelRightIcon = registerIcon('panel-right', Codicon.layoutSidebarRight, (
     'panelRight',
     "Represents side bar in the right position"
 )));
-registerIcon('panel-right-off', Codicon.layoutSidebarRightOff, ( localizeWithPath(
+const panelRightOffIcon = registerIcon('panel-right-off', Codicon.layoutSidebarRightOff, ( localizeWithPath(
     'vs/workbench/browser/actions/layoutActions',
     'panelRightOff',
     "Represents side bar in the right position toggled off"
@@ -245,6 +245,115 @@ const configureLayoutIcon = registerIcon('configure-layout-icon', Codicon.layout
     'cofigureLayoutIcon',
     'Icon represents workbench layout configuration.'
 )));
+MenuRegistry.appendMenuItems([{
+        id: MenuId.ViewContainerTitleContext,
+        item: {
+            group: '3_workbench_layout_move',
+            command: {
+                id: ToggleSidebarPositionAction.ID,
+                title: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'move side bar right',
+                    "Move Primary Side Bar Right"
+                ))
+            },
+            when: ( ContextKeyExpr.and(( ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right')), ( ContextKeyExpr.equals(
+                'viewContainerLocation',
+                ViewContainerLocationToString(0 )
+            )))),
+            order: 1
+        }
+    }, {
+        id: MenuId.ViewTitleContext,
+        item: {
+            group: '3_workbench_layout_move',
+            command: {
+                id: ToggleSidebarPositionAction.ID,
+                title: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'move sidebar right',
+                    "Move Primary Side Bar Right"
+                ))
+            },
+            when: ( ContextKeyExpr.and(( ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right')), ( ContextKeyExpr.equals(
+                'viewLocation',
+                ViewContainerLocationToString(0 )
+            )))),
+            order: 1
+        }
+    }, {
+        id: MenuId.ViewContainerTitleContext,
+        item: {
+            group: '3_workbench_layout_move',
+            command: {
+                id: ToggleSidebarPositionAction.ID,
+                title: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'move sidebar left',
+                    "Move Primary Side Bar Left"
+                ))
+            },
+            when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')), ( ContextKeyExpr.equals(
+                'viewContainerLocation',
+                ViewContainerLocationToString(0 )
+            )))),
+            order: 1
+        }
+    }, {
+        id: MenuId.ViewTitleContext,
+        item: {
+            group: '3_workbench_layout_move',
+            command: {
+                id: ToggleSidebarPositionAction.ID,
+                title: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'move sidebar left',
+                    "Move Primary Side Bar Left"
+                ))
+            },
+            when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')), ( ContextKeyExpr.equals(
+                'viewLocation',
+                ViewContainerLocationToString(0 )
+            )))),
+            order: 1
+        }
+    }, {
+        id: MenuId.ViewTitleContext,
+        item: {
+            group: '3_workbench_layout_move',
+            command: {
+                id: ToggleSidebarPositionAction.ID,
+                title: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'move second sidebar left',
+                    "Move Secondary Side Bar Left"
+                ))
+            },
+            when: ( ContextKeyExpr.and(( ContextKeyExpr.notEquals('config.workbench.sideBar.location', 'right')), ( ContextKeyExpr.equals(
+                'viewLocation',
+                ViewContainerLocationToString(2 )
+            )))),
+            order: 1
+        }
+    }, {
+        id: MenuId.ViewTitleContext,
+        item: {
+            group: '3_workbench_layout_move',
+            command: {
+                id: ToggleSidebarPositionAction.ID,
+                title: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'move second sidebar right',
+                    "Move Secondary Side Bar Right"
+                ))
+            },
+            when: ( ContextKeyExpr.and(( ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')), ( ContextKeyExpr.equals(
+                'viewLocation',
+                ViewContainerLocationToString(2 )
+            )))),
+            order: 1
+        }
+    }]);
 registerAction2(class extends Action2 {
     constructor() {
         super({
@@ -321,6 +430,79 @@ class ToggleSidebarVisibilityAction extends Action2 {
     }
 }
 registerAction2(ToggleSidebarVisibilityAction);
+MenuRegistry.appendMenuItems([
+    {
+        id: MenuId.ViewContainerTitleContext,
+        item: {
+            group: '3_workbench_layout_move',
+            command: {
+                id: ToggleSidebarVisibilityAction.ID,
+                title: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'compositePart.hideSideBarLabel',
+                    "Hide Primary Side Bar"
+                )),
+            },
+            when: ( ContextKeyExpr.and(SideBarVisibleContext, ( ContextKeyExpr.equals(
+                'viewContainerLocation',
+                ViewContainerLocationToString(0 )
+            )))),
+            order: 2
+        }
+    }, {
+        id: MenuId.ViewTitleContext,
+        item: {
+            group: '3_workbench_layout_move',
+            command: {
+                id: ToggleSidebarVisibilityAction.ID,
+                title: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'compositePart.hideSideBarLabel',
+                    "Hide Primary Side Bar"
+                )),
+            },
+            when: ( ContextKeyExpr.and(SideBarVisibleContext, ( ContextKeyExpr.equals(
+                'viewLocation',
+                ViewContainerLocationToString(0 )
+            )))),
+            order: 2
+        }
+    }, {
+        id: MenuId.LayoutControlMenu,
+        item: {
+            group: '0_workbench_toggles',
+            command: {
+                id: ToggleSidebarVisibilityAction.ID,
+                title: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'toggleSideBar',
+                    "Toggle Primary Side Bar"
+                )),
+                icon: panelLeftOffIcon,
+                toggled: { condition: SideBarVisibleContext, icon: panelLeftIcon }
+            },
+            when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( ContextKeyExpr.equals('config.workbench.layoutControl.type', 'toggles')), ( ContextKeyExpr.equals('config.workbench.layoutControl.type', 'both')))), ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'left')))),
+            order: 0
+        }
+    }, {
+        id: MenuId.LayoutControlMenu,
+        item: {
+            group: '0_workbench_toggles',
+            command: {
+                id: ToggleSidebarVisibilityAction.ID,
+                title: ( localizeWithPath(
+                    'vs/workbench/browser/actions/layoutActions',
+                    'toggleSideBar',
+                    "Toggle Primary Side Bar"
+                )),
+                icon: panelRightOffIcon,
+                toggled: { condition: SideBarVisibleContext, icon: panelRightIcon }
+            },
+            when: ( ContextKeyExpr.and(( ContextKeyExpr.or(( ContextKeyExpr.equals('config.workbench.layoutControl.type', 'toggles')), ( ContextKeyExpr.equals('config.workbench.layoutControl.type', 'both')))), ( ContextKeyExpr.equals('config.workbench.sideBar.location', 'right')))),
+            order: 2
+        }
+    }
+]);
 class ToggleStatusbarVisibilityAction extends Action2 {
     static { this.ID = 'workbench.action.toggleStatusbarVisibility'; }
     static { this.statusbarVisibleKey = 'workbench.statusBar.visible'; }