@codingame/monaco-vscode-api 1.85.0 → 1.85.2

package/vscode/src/vs/platform/userDataSync/common/userDataSyncAccount.js

@@ -1,3 +1,45 @@
+import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
+import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
+import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { IUserDataSyncStoreService, IUserDataSyncLogService } from './userDataSync.js';
 const IUserDataSyncAccountService = ( createDecorator('IUserDataSyncAccountService'));
-export { IUserDataSyncAccountService };
+let UserDataSyncAccountService = class UserDataSyncAccountService extends Disposable {
+    get account() { return this._account; }
+    constructor(userDataSyncStoreService, logService) {
+        super();
+        this.userDataSyncStoreService = userDataSyncStoreService;
+        this.logService = logService;
+        this._onDidChangeAccount = this._register(( new Emitter()));
+        this.onDidChangeAccount = this._onDidChangeAccount.event;
+        this._onTokenFailed = this._register(( new Emitter()));
+        this.onTokenFailed = this._onTokenFailed.event;
+        this.wasTokenFailed = false;
+        this._register(userDataSyncStoreService.onTokenFailed(code => {
+            this.logService.info('Settings Sync auth token failed', this.account?.authenticationProviderId, this.wasTokenFailed, code);
+            this.updateAccount(undefined);
+            if (code === "Forbidden" ) {
+                this._onTokenFailed.fire(true );
+            }
+            else {
+                this._onTokenFailed.fire(this.wasTokenFailed );
+            }
+            this.wasTokenFailed = true;
+        }));
+        this._register(userDataSyncStoreService.onTokenSucceed(() => this.wasTokenFailed = false));
+    }
+    async updateAccount(account) {
+        if (account && this._account ? account.token !== this._account.token || account.authenticationProviderId !== this._account.authenticationProviderId : account !== this._account) {
+            this._account = account;
+            if (this._account) {
+                this.userDataSyncStoreService.setAuthToken(this._account.token, this._account.authenticationProviderId);
+            }
+            this._onDidChangeAccount.fire(account);
+        }
+    }
+};
+UserDataSyncAccountService = ( __decorate([
+    ( __param(0, IUserDataSyncStoreService)),
+    ( __param(1, IUserDataSyncLogService))
+], UserDataSyncAccountService));
+export { IUserDataSyncAccountService, UserDataSyncAccountService };

package/vscode/src/vs/platform/userDataSync/common/userDataSyncMachines.js

@@ -0,0 +1,177 @@
+import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
+import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
+import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { isSafari, isChrome, isEdge, isFirefox, isAndroid, PlatformToString, isWeb, platform } from 'monaco-editor/esm/vs/base/common/platform.js';
+import { escapeRegExpCharacters } from 'monaco-editor/esm/vs/base/common/strings.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
+import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
+import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
+import { getServiceMachineId } from '../../externalServices/common/serviceMachineId.js';
+import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
+import { IUserDataSyncStoreService, IUserDataSyncLogService } from './userDataSync.js';
+var UserDataSyncMachinesService_1;
+const IUserDataSyncMachinesService = ( createDecorator('IUserDataSyncMachinesService'));
+const currentMachineNameKey = 'sync.currentMachineName';
+const Safari = 'Safari';
+const Chrome = 'Chrome';
+const Edge = 'Edge';
+const Firefox = 'Firefox';
+const Android = 'Android';
+function isWebPlatform(platform) {
+    switch (platform) {
+        case Safari:
+        case Chrome:
+        case Edge:
+        case Firefox:
+        case Android:
+        case PlatformToString(0 ):
+            return true;
+    }
+    return false;
+}
+function getPlatformName() {
+    if (isSafari) {
+        return Safari;
+    }
+    if (isChrome) {
+        return Chrome;
+    }
+    if (isEdge) {
+        return Edge;
+    }
+    if (isFirefox) {
+        return Firefox;
+    }
+    if (isAndroid) {
+        return Android;
+    }
+    return PlatformToString(isWeb ? 0  : platform);
+}
+let UserDataSyncMachinesService = class UserDataSyncMachinesService extends Disposable {
+    static { UserDataSyncMachinesService_1 = this; }
+    static { this.VERSION = 1; }
+    static { this.RESOURCE = 'machines'; }
+    constructor(environmentService, fileService, storageService, userDataSyncStoreService, logService, productService) {
+        super();
+        this.storageService = storageService;
+        this.userDataSyncStoreService = userDataSyncStoreService;
+        this.logService = logService;
+        this.productService = productService;
+        this._onDidChange = this._register(( new Emitter()));
+        this.onDidChange = this._onDidChange.event;
+        this.userData = null;
+        this.currentMachineIdPromise = getServiceMachineId(environmentService, fileService, storageService);
+    }
+    async getMachines(manifest) {
+        const currentMachineId = await this.currentMachineIdPromise;
+        const machineData = await this.readMachinesData(manifest);
+        return ( machineData.machines.map(
+            machine => ({ ...machine, ...{ isCurrent: machine.id === currentMachineId } })
+        ));
+    }
+    async addCurrentMachine(manifest) {
+        const currentMachineId = await this.currentMachineIdPromise;
+        const machineData = await this.readMachinesData(manifest);
+        if (!( machineData.machines.some(({ id }) => id === currentMachineId))) {
+            machineData.machines.push({ id: currentMachineId, name: this.computeCurrentMachineName(machineData.machines), platform: getPlatformName() });
+            await this.writeMachinesData(machineData);
+        }
+    }
+    async removeCurrentMachine(manifest) {
+        const currentMachineId = await this.currentMachineIdPromise;
+        const machineData = await this.readMachinesData(manifest);
+        const updatedMachines = machineData.machines.filter(({ id }) => id !== currentMachineId);
+        if (updatedMachines.length !== machineData.machines.length) {
+            machineData.machines = updatedMachines;
+            await this.writeMachinesData(machineData);
+        }
+    }
+    async renameMachine(machineId, name, manifest) {
+        const machineData = await this.readMachinesData(manifest);
+        const machine = machineData.machines.find(({ id }) => id === machineId);
+        if (machine) {
+            machine.name = name;
+            await this.writeMachinesData(machineData);
+            const currentMachineId = await this.currentMachineIdPromise;
+            if (machineId === currentMachineId) {
+                this.storageService.store(currentMachineNameKey, name, -1 , 1 );
+            }
+        }
+    }
+    async setEnablements(enablements) {
+        const machineData = await this.readMachinesData();
+        for (const [machineId, enabled] of enablements) {
+            const machine = machineData.machines.find(machine => machine.id === machineId);
+            if (machine) {
+                machine.disabled = enabled ? undefined : true;
+            }
+        }
+        await this.writeMachinesData(machineData);
+    }
+    computeCurrentMachineName(machines) {
+        const previousName = this.storageService.get(currentMachineNameKey, -1 );
+        if (previousName) {
+            return previousName;
+        }
+        const namePrefix = `${this.productService.embedderIdentifier ? `${this.productService.embedderIdentifier} - ` : ''}${getPlatformName()} (${this.productService.nameShort})`;
+        const nameRegEx = ( new RegExp(`${escapeRegExpCharacters(namePrefix)}\\s#(\\d+)`));
+        let nameIndex = 0;
+        for (const machine of machines) {
+            const matches = nameRegEx.exec(machine.name);
+            const index = matches ? parseInt(matches[1]) : 0;
+            nameIndex = index > nameIndex ? index : nameIndex;
+        }
+        return `${namePrefix} #${nameIndex + 1}`;
+    }
+    async readMachinesData(manifest) {
+        this.userData = await this.readUserData(manifest);
+        const machinesData = this.parse(this.userData);
+        if (machinesData.version !== UserDataSyncMachinesService_1.VERSION) {
+            throw new Error(localizeWithPath('vs/platform/userDataSync/common/userDataSyncMachines', 'error incompatible', "Cannot read machines data as the current version is incompatible. Please update {0} and try again.", this.productService.nameLong));
+        }
+        return machinesData;
+    }
+    async writeMachinesData(machinesData) {
+        const content = JSON.stringify(machinesData);
+        const ref = await this.userDataSyncStoreService.writeResource(UserDataSyncMachinesService_1.RESOURCE, content, this.userData?.ref || null);
+        this.userData = { ref, content };
+        this._onDidChange.fire();
+    }
+    async readUserData(manifest) {
+        if (this.userData) {
+            const latestRef = manifest && manifest.latest ? manifest.latest[UserDataSyncMachinesService_1.RESOURCE] : undefined;
+            if (this.userData.ref === latestRef) {
+                return this.userData;
+            }
+            if (latestRef === undefined && this.userData.content === null) {
+                return this.userData;
+            }
+        }
+        return this.userDataSyncStoreService.readResource(UserDataSyncMachinesService_1.RESOURCE, this.userData);
+    }
+    parse(userData) {
+        if (userData.content !== null) {
+            try {
+                return JSON.parse(userData.content);
+            }
+            catch (e) {
+                this.logService.error(e);
+            }
+        }
+        return {
+            version: UserDataSyncMachinesService_1.VERSION,
+            machines: []
+        };
+    }
+};
+UserDataSyncMachinesService = UserDataSyncMachinesService_1 = ( __decorate([
+    ( __param(0, IEnvironmentService)),
+    ( __param(1, IFileService)),
+    ( __param(2, IStorageService)),
+    ( __param(3, IUserDataSyncStoreService)),
+    ( __param(4, IUserDataSyncLogService)),
+    ( __param(5, IProductService))
+], UserDataSyncMachinesService));
+export { IUserDataSyncMachinesService, UserDataSyncMachinesService, isWebPlatform };

package/vscode/src/vs/workbench/api/common/extHostApiCommands.js

@@ -5,7 +5,7 @@ import * as languages from 'monaco-editor/esm/vs/editor/common/languages.js';
 import { decodeSemanticTokensDto } from 'monaco-editor/esm/vs/editor/common/services/semanticTokensDto.js';
 import { validateWhenClauses } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
 import { ApiCommand, ApiCommandArgument, ApiCommandResult } from './extHostCommands.js';
-import { Position as Position$1, Range, WorkspaceSymbol, CallHierarchyItem, CallHierarchyIncomingCall, CallHierarchyOutgoingCall, WorkspaceEdit, DocumentLink, SignatureHelp, Selection as Selection$1, Color, ColorPresentation, InlayHint, FoldingRange, InlineValueContext, InlineValue, ViewColumn, TextEditorOpenOptions, TypeHierarchyItem, MappedEditsContext, DefinitionLink, location, DocumentHighlight, SymbolKind, TextEdit, Hover, CompletionItem, NotebookExclusiveDocumentPattern } from './extHostTypeConverters.js';
+import { Position as Position$1, Range, WorkspaceSymbol, CallHierarchyItem, CallHierarchyIncomingCall, CallHierarchyOutgoingCall, WorkspaceEdit, DocumentLink, CompletionItem, SignatureHelp, Selection as Selection$1, Color, ColorPresentation, InlayHint, FoldingRange, InlineValueContext, InlineValue, ViewColumn, TextEditorOpenOptions, TypeHierarchyItem, MappedEditsContext, DefinitionLink, location, DocumentHighlight, SymbolKind, TextEdit, Hover, NotebookExclusiveDocumentPattern } from './extHostTypeConverters.js';
 import { Position, SelectionRange, SemanticTokensLegend, SemanticTokens, CompletionList, Range as Range$1, Selection, ColorInformation, Color as Color$1, SymbolInformation, Location, CodeLens, CodeAction, CodeActionKind } from './extHostTypes.js';
 const newCommands = [
     (

package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js

@@ -19,7 +19,7 @@ import { CellKind, NotebookCellExecutionState as NotebookCellExecutionState$1 }
 import { TestId } from '../../contrib/testing/common/testId.js';
 import { namespaceTestTag, denamespaceTestTag } from '../../contrib/testing/common/testTypes.js';
 import { SIDE_GROUP, ACTIVE_GROUP } from '../../services/editor/common/editorService.js';
-import { Position as Position$1, Selection as Selection$1, Range as Range$1, Diagnostic as Diagnostic$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, TextEdit as TextEdit$1, WorkspaceEdit as WorkspaceEdit$1, SnippetTextEdit, SnippetString, SymbolKind as SymbolKind$1, SymbolInformation, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, Location, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, InlayHint as InlayHint$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, NotebookRange as NotebookRange$1, NotebookCellData as NotebookCellData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, TestTag as TestTag$1, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, ChatMessage as ChatMessage$1, InteractiveEditorResponseFeedbackKind as InteractiveEditorResponseFeedbackKind$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, SymbolTag as SymbolTag$1, DocumentSymbol as DocumentSymbol$1, Hover as Hover$1, EvaluatableExpression as EvaluatableExpression$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, CompletionItem as CompletionItem$1, InlayHintLabelPart as InlayHintLabelPart$1, SelectionRange as SelectionRange$1, EndOfLine as EndOfLine$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, DataTransfer as DataTransfer$1, ChatMessageRole as ChatMessageRole$1, ChatVariableLevel as ChatVariableLevel$1, DiagnosticTag as DiagnosticTag$1, DecorationRangeBehavior as DecorationRangeBehavior$1, NotebookCellKind as NotebookCellKind$1, StandardTokenType, CompletionTriggerKind as CompletionTriggerKind$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, TestMessage as TestMessage$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, NotebookRendererScript as NotebookRendererScript$1 } from './extHostTypes.js';
+import { Position as Position$1, Selection as Selection$1, Range as Range$1, Diagnostic as Diagnostic$1, ViewColumn as ViewColumn$1, MarkdownString as MarkdownString$1, TextEdit as TextEdit$1, WorkspaceEdit as WorkspaceEdit$1, SnippetTextEdit, SnippetString, SymbolKind as SymbolKind$1, SymbolInformation, CallHierarchyItem as CallHierarchyItem$1, CallHierarchyIncomingCall as CallHierarchyIncomingCall$1, CallHierarchyOutgoingCall as CallHierarchyOutgoingCall$1, Location, InlineValueText, InlineValueVariableLookup, InlineValueEvaluatableExpression, InlineValueContext as InlineValueContext$1, CompletionItem as CompletionItem$1, InlayHint as InlayHint$1, DocumentLink as DocumentLink$1, ColorPresentation as ColorPresentation$1, Color as Color$1, NotebookRange as NotebookRange$1, NotebookCellData as NotebookCellData$1, NotebookCellOutputItem as NotebookCellOutputItem$1, NotebookCellOutput as NotebookCellOutput$1, TestTag as TestTag$1, CodeActionTriggerKind as CodeActionTriggerKind$1, TypeHierarchyItem as TypeHierarchyItem$1, ChatMessage as ChatMessage$1, InteractiveEditorResponseFeedbackKind as InteractiveEditorResponseFeedbackKind$1, DiagnosticRelatedInformation as DiagnosticRelatedInformation$1, DiagnosticSeverity as DiagnosticSeverity$1, SymbolTag as SymbolTag$1, DocumentSymbol as DocumentSymbol$1, Hover as Hover$1, EvaluatableExpression as EvaluatableExpression$1, DocumentHighlight as DocumentHighlight$1, MultiDocumentHighlight as MultiDocumentHighlight$1, CompletionItemTag as CompletionItemTag$1, CompletionItemKind as CompletionItemKind$1, InlayHintLabelPart as InlayHintLabelPart$1, SelectionRange as SelectionRange$1, EndOfLine as EndOfLine$1, FoldingRangeKind as FoldingRangeKind$1, RelativePattern, NotebookData as NotebookData$1, NotebookCellStatusBarAlignment, DataTransfer as DataTransfer$1, ChatMessageRole as ChatMessageRole$1, ChatVariableLevel as ChatVariableLevel$1, DiagnosticTag as DiagnosticTag$1, DecorationRangeBehavior as DecorationRangeBehavior$1, NotebookCellKind as NotebookCellKind$1, StandardTokenType, CompletionTriggerKind as CompletionTriggerKind$1, TextDocumentSaveReason as TextDocumentSaveReason$1, TextEditorLineNumbersStyle as TextEditorLineNumbersStyle$1, ProgressLocation as ProgressLocation$1, NotebookCellExecutionState as NotebookCellExecutionState$2, TestMessage as TestMessage$1, InternalFileDataTransferItem, DataTransferFile, InternalDataTransferItem, NotebookRendererScript as NotebookRendererScript$1 } from './extHostTypes.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 var Selection;
 ( (function(Selection) {

package/vscode/src/vs/workbench/api/common/extHostWebview.js

@@ -1,7 +1,7 @@
 import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
 import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
 import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import * as objects from 'monaco-editor/esm/vs/base/common/objects.js';
+import * as Objects from 'monaco-editor/esm/vs/base/common/objects.js';
 import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
 import { normalizeVersion, parseVersion } from '../../../platform/extensions/common/extensionValidator.js';
 import { deserializeWebviewMessage, serializeWebviewMessage } from './extHostWebviewMessaging.js';
@@ -81,7 +81,7 @@ class ExtHostWebview {
     }
     set options(newOptions) {
         this.assertNotDisposed();
-        if (!objects.equals(this.#options, newOptions)) {
+        if (!Objects.equals(this.#options, newOptions)) {
             this.#proxy.$setOptions(this.#handle, serializeWebviewOptions(this.#extension, this.#workspace, newOptions));
         }
         this.#options = newOptions;

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'; }

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

@@ -0,0 +1,105 @@
+import * as dom from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { setupCustomHover } from 'monaco-editor/esm/vs/base/browser/ui/iconLabel/iconLabelHover.js';
+import { Toggle } from 'monaco-editor/esm/vs/base/browser/ui/toggle/toggle.js';
+import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
+import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
+import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { defaultToggleStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
+class CheckboxStateHandler extends Disposable {
+    constructor() {
+        super(...arguments);
+        this._onDidChangeCheckboxState = this._register(( new Emitter()));
+        this.onDidChangeCheckboxState = this._onDidChangeCheckboxState.event;
+    }
+    setCheckboxState(node) {
+        this._onDidChangeCheckboxState.fire([node]);
+    }
+}
+class TreeItemCheckbox extends Disposable {
+    static { this.checkboxClass = 'custom-view-tree-node-item-checkbox'; }
+    constructor(container, checkboxStateHandler, hoverDelegate) {
+        super();
+        this.checkboxStateHandler = checkboxStateHandler;
+        this.hoverDelegate = hoverDelegate;
+        this.isDisposed = false;
+        this._onDidChangeState = ( new Emitter());
+        this.onDidChangeState = this._onDidChangeState.event;
+        this.checkboxContainer = container;
+    }
+    render(node) {
+        if (node.checkbox) {
+            if (!this.toggle) {
+                this.createCheckbox(node);
+            }
+            else {
+                this.toggle.checked = node.checkbox.isChecked;
+                this.toggle.setIcon(this.toggle.checked ? Codicon.check : undefined);
+            }
+        }
+    }
+    createCheckbox(node) {
+        if (node.checkbox) {
+            this.toggle = ( new Toggle({
+                isChecked: node.checkbox.isChecked,
+                title: '',
+                icon: node.checkbox.isChecked ? Codicon.check : undefined,
+                ...defaultToggleStyles
+            }));
+            this.setHover(node.checkbox);
+            this.setAccessibilityInformation(node.checkbox);
+            this.toggle.domNode.classList.add(TreeItemCheckbox.checkboxClass);
+            this.toggle.domNode.tabIndex = 1;
+            dom.append(this.checkboxContainer, this.toggle.domNode);
+            this.registerListener(node);
+        }
+    }
+    registerListener(node) {
+        if (this.toggle) {
+            this._register({ dispose: () => this.removeCheckbox() });
+            this._register(this.toggle);
+            this._register(this.toggle.onChange(() => {
+                this.setCheckbox(node);
+            }));
+        }
+    }
+    setHover(checkbox) {
+        if (this.toggle) {
+            if (!this.hover) {
+                this.hover = setupCustomHover(this.hoverDelegate, this.toggle.domNode, this.checkboxHoverContent(checkbox));
+                this._register(this.hover);
+            }
+            else {
+                this.hover.update(checkbox.tooltip);
+            }
+        }
+    }
+    setCheckbox(node) {
+        if (this.toggle && node.checkbox) {
+            node.checkbox.isChecked = this.toggle.checked;
+            this.toggle.setIcon(this.toggle.checked ? Codicon.check : undefined);
+            this.setHover(node.checkbox);
+            this.setAccessibilityInformation(node.checkbox);
+            this.checkboxStateHandler.setCheckboxState(node);
+        }
+    }
+    checkboxHoverContent(checkbox) {
+        return checkbox.tooltip ? checkbox.tooltip :
+            checkbox.isChecked ? ( localizeWithPath('vs/workbench/browser/parts/views/checkbox', 'checked', 'Checked')) : ( localizeWithPath('vs/workbench/browser/parts/views/checkbox', 'unchecked', 'Unchecked'));
+    }
+    setAccessibilityInformation(checkbox) {
+        if (this.toggle && checkbox.accessibilityInformation) {
+            this.toggle.domNode.ariaLabel = checkbox.accessibilityInformation.label;
+            if (checkbox.accessibilityInformation.role) {
+                this.toggle.domNode.role = checkbox.accessibilityInformation.role;
+            }
+        }
+    }
+    removeCheckbox() {
+        const children = this.checkboxContainer.children;
+        for (const child of children) {
+            this.checkboxContainer.removeChild(child);
+        }
+    }
+}
+export { CheckboxStateHandler, TreeItemCheckbox };

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

@@ -0,0 +1,4 @@
+import n from '../../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
+var css = ".file-icon-themable-tree .align-icon-with-twisty .monaco-tl-twistie:not(.force-twistie):not(.collapsible),.file-icon-themable-tree .monaco-tl-twistie.force-no-twistie,.file-icon-themable-tree.align-icons-and-twisties .monaco-tl-twistie:not(.force-twistie):not(.collapsible),.file-icon-themable-tree.hide-arrows .monaco-tl-twistie:not(.force-twistie){background-image:none!important;padding-right:0!important;visibility:hidden;width:0!important}.file-icon-themable-tree .monaco-list-row .content .monaco-highlighted-label .highlight,.monaco-tl-contents .monaco-highlighted-label .highlight{background-color:var(--vscode-list-filterMatchBackground);color:unset!important;outline:1px dotted var(--vscode-list-filterMatchBorder);outline-offset:-1px}.monaco-workbench .tree-explorer-viewlet-tree-view{height:100%}.monaco-workbench .tree-explorer-viewlet-tree-view .message{display:flex;padding:4px 12px 4px 18px;user-select:text;-webkit-user-select:text}.monaco-workbench .tree-explorer-viewlet-tree-view .message p{margin-bottom:0;margin-top:0;padding-bottom:4px}.monaco-workbench .tree-explorer-viewlet-tree-view .message ul{padding-left:24px}.monaco-workbench .tree-explorer-viewlet-tree-view .message a{color:var(--vscode-textLink-foreground)}.monaco-workbench .tree-explorer-viewlet-tree-view .message.hide{display:none}.monaco-workbench .tree-explorer-viewlet-tree-view .customview-tree{height:100%}.monaco-workbench .tree-explorer-viewlet-tree-view .customview-tree.hide{display:none}.monaco-workbench .pane>.pane-body>.welcome-view{box-sizing:border-box;display:flex;flex-direction:column;height:100%;width:100%}.monaco-workbench .pane>.pane-body.welcome>:not(.welcome-view),.monaco-workbench .pane>.pane-body:not(.welcome)>.welcome-view{display:none}.monaco-workbench .pane>.pane-body .welcome-view-content{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;padding:0 20px 1em}.monaco-workbench .pane>.pane-body .welcome-view-content>.button-container{max-width:300px;width:100%}.monaco-workbench:not(.reduce-motion) .pane>.pane-body .welcome-view-content>.button-container{transition:max-width .2s ease-out}.monaco-workbench .pane>.pane-body .welcome-view-content.wide>.button-container{max-width:100%}.monaco-workbench .pane>.pane-body .welcome-view-content>.button-container>.monaco-button{max-width:300px}.monaco-workbench .pane>.pane-body .welcome-view-content>p{width:100%}.monaco-workbench .pane>.pane-body .welcome-view-content>*{margin-block-end:0;margin-block-start:1em;margin-inline-end:0;margin-inline-start:0}.customview-tree .monaco-list-row .monaco-tl-contents.align-icon-with-twisty:before{display:none}.customview-tree .monaco-list-row .monaco-tl-contents:not(.align-icon-with-twisty):before{display:inline-block}.customview-tree .monaco-list .monaco-list-row{padding-left:0;padding-right:12px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item{display:flex;flex:1;flex-wrap:nowrap;height:22px;line-height:22px;overflow:hidden;padding-left:3px;text-overflow:ellipsis}.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .custom-view-tree-node-item-checkbox{background-color:var(--vscode-checkbox-selectBackground);border:1px solid var(--vscode-checkbox-selectBorder)}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-checkbox{background-color:var(--vscode-checkbox-background);border:1px solid var(--vscode-checkbox-border);height:16px;margin:3px 6px 3px 0;opacity:1;padding:0;width:16px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-checkbox.codicon{font-size:13px;line-height:15px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .monaco-inputbox{flex:1;line-height:normal}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel{flex:1;overflow:hidden;text-overflow:ellipsis}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .monaco-icon-label-container:after{content:\"\";display:block}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon,.timeline-tree-view .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-icon{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;align-items:center;background-position:0;background-repeat:no-repeat;background-size:16px;display:flex;height:22px;justify-content:center;padding-right:6px;width:16px}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.disabled{opacity:.6}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.codicon.codicon-modifier-spin{margin-left:-6px;padding-left:6px}.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item>.custom-view-tree-node-item-resourceLabel>.custom-view-tree-node-item-icon.codicon{color:currentColor!important}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel .monaco-icon-label-container>.monaco-icon-name-container{flex:1}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel:after{margin-right:4px;padding-right:0}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .actions{display:none}.customview-tree .monaco-list .monaco-list-row .custom-view-tree-node-item .actions .action-label{padding:2px}.customview-tree .monaco-list .monaco-list-row.focused .custom-view-tree-node-item .actions,.customview-tree .monaco-list .monaco-list-row.selected .custom-view-tree-node-item .actions,.customview-tree .monaco-list .monaco-list-row:hover .custom-view-tree-node-item .actions{display:block}.viewpane-filter-container{cursor:default;display:flex}.viewpane-filter-container.grow{flex:1}.viewpane-filter-container>.viewpane-filter{align-items:center;display:flex;flex:1;position:relative}.viewpane-filter-container>.viewpane-filter .monaco-inputbox{flex:1;font-size:12px;height:24px}.pane-header .viewpane-filter-container>.viewpane-filter .monaco-inputbox .monaco-inputbox{height:20px;line-height:18px}.monaco-workbench.vs .viewpane-filter-container>.viewpane-filter .monaco-inputbox{height:25px}.viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls{align-items:center;bottom:0;display:flex;position:absolute;right:0;top:0}.viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls>.viewpane-filter-badge{border-radius:2px;margin:4px 0;padding:0 8px}.viewpane-filter.small>.viewpane-filter-controls>.viewpane-filter-badge,.viewpane-filter>.viewpane-filter-controls>.viewpane-filter-badge.hidden{display:none}.viewpane-filter>.viewpane-filter-controls>.monaco-action-bar .action-item .action-label.codicon.filter{padding:2px}.panel>.title .monaco-action-bar .action-item.viewpane-filter-container{margin-right:10px;max-width:400px;min-width:150px}.pane-body .viewpane-filter-container:not(:empty){flex:1;height:auto;margin:10px 20px}.pane-body .viewpane-filter-container>.viewpane-filter>.viewpane-filter-controls .monaco-action-bar .action-item{margin-right:4px}.viewpane-filter>.viewpane-filter-controls .monaco-action-bar .action-label.codicon.codicon-filter.checked{background-color:var(--vscode-inputOption-activeBackground);border-color:var(--vscode-inputOption-activeBorder);color:var(--vscode-inputOption-activeForeground)}";
+n(css,{});
+export { css, css as default };