@codingame/monaco-vscode-api 36.2.7 → 37.0.0

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

@@ -1,28 +1,31 @@
 
 import { registerCss } from '../../../../../../../css.js';
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { $, hide, DragAndDropObserver, createElement, append, getWindow, getDomNodePagePosition, trackFocus } from '../../../../base/browser/dom.js';
+import { $, hide, DragAndDropObserver, createElement, append, Dimension, addDisposableListener, EventType, EventHelper, getWindow, getDomNodePagePosition, trackFocus } from '../../../../base/browser/dom.js';
 import { StandardMouseEvent } from '../../../../base/browser/mouseEvent.js';
 import { PixelRatio } from '../../../../base/browser/pixelRatio.js';
 import { BreadcrumbsItem, BreadcrumbsWidget } from '../../../../base/browser/ui/breadcrumbs/breadcrumbsWidget.js';
 import { applyDragImage } from '../../../../base/browser/ui/dnd/dnd.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
 import { timeout } from '../../../../base/common/async.js';
 import { Codicon } from '../../../../base/common/codicons.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { KeyMod as KeyMod$1, KeyCode } from '../../../../base/common/keyCodes.js';
 import { DisposableStore, toDisposable, MutableDisposable, combinedDisposable } from '../../../../base/common/lifecycle.js';
-import { extUri, basename } from '../../../../base/common/resources.js';
+import { basename } from '../../../../base/common/resources.js';
 import { URI } from '../../../../base/common/uri.js';
 import { OutlineElement } from '../../../../editor/contrib/documentSymbols/browser/outlineModel.js';
 import { localize, localize2 } from '../../../../nls.js';
 import { Categories } from '../../../../platform/action/common/actionCommonCategories.js';
 import { registerAction2, Action2, MenuId } from '../../../../platform/actions/common/actions.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.service.js';
 import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
-import { IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
+import { IContextViewService, IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { fillInSymbolsDragData, LocalSelectionTransfer } from '../../../../platform/dnd/browser/dnd.js';
 import { FileKind } from '../../../../platform/files/common/files.js';
 import { IFileService } from '../../../../platform/files/common/files.service.js';
@@ -36,6 +39,8 @@ import { defaultBreadcrumbsWidgetStyles } from '../../../../platform/theme/brows
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
 import { EditorResourceAccessor, SideBySideEditor } from '../../../common/editor.js';
 import { IEditorGroupsService } from '../../../services/editor/common/editorGroupsService.service.js';
+import { hiddenEditorTypesSettingId } from '../../../services/editor/common/editorResolverService.js';
+import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.service.js';
 import { SIDE_GROUP, ACTIVE_GROUP } from '../../../services/editor/common/editorService.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { OutlineTarget } from '../../../services/outline/browser/outline.js';
@@ -46,6 +51,7 @@ import { BreadcrumbsConfig } from './breadcrumbs.js';
 import { IBreadcrumbsService } from './breadcrumbs.service.js';
 import { BreadcrumbsModel, FileElement, OutlineElement2 } from './breadcrumbsModel.js';
 import { BreadcrumbsFilePicker, BreadcrumbsOutlinePicker } from './breadcrumbsPicker.js';
+import { editorTypeDisplayLabel, getAvailableEditorTypes, createEditorTypeActions } from './editorTypePicker.js';
 import * as breadcrumbscontrol from './media/breadcrumbscontrol.css';
 import { ScrollbarVisibility } from '../../../../base/common/scrollable.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
@@ -133,13 +139,13 @@ let FileItem = FileItem_1 = class FileItem extends BreadcrumbsItem {
         if (!(other instanceof FileItem_1)) {
             return false;
         }
-        return (extUri.isEqual(this.element.uri, other.element.uri) && this.options.showFileIcons === other.options.showFileIcons && this.options.showSymbolIcons === other.options.showSymbolIcons);
+        return (this.element.equals(other.element) && this.options.showFileIcons === other.options.showFileIcons && this.options.showSymbolIcons === other.options.showSymbolIcons);
     }
     render(container) {
         const label = this._labels.create(container, {
             hoverDelegate: this._hoverDelegate
         });
-        label.setFile(this.element.uri, {
+        const options = {
             hidePath: true,
             hideIcon: this.element.kind === FileKind.FOLDER || !this.options.showFileIcons,
             fileKind: this.element.kind,
@@ -147,7 +153,18 @@ let FileItem = FileItem_1 = class FileItem extends BreadcrumbsItem {
                 colors: this.options.showDecorationColors,
                 badges: false
             }
-        });
+        };
+        if (this.element.label) {
+            label.setResource({
+                resource: this.element.uri,
+                name: this.element.label
+            }, {
+                ...options,
+                forceLabel: true
+            });
+        } else {
+            label.setFile(this.element.uri, options);
+        }
         container.classList.add(FileKind[this.element.kind].toLowerCase());
         this._disposables.add(label);
         this._disposables.add(
@@ -199,7 +216,7 @@ function createBreadcrumbDndObserver(accessor, container, label, item, model, dr
         }
     });
 }
-const separatorIcon = registerIcon("breadcrumb-separator", Codicon.chevronRight, ( localize(3353, "Icon for the separator in the breadcrumbs.")));
+const separatorIcon = registerIcon("breadcrumb-separator", Codicon.chevronRight, ( localize(3575, "Icon for the separator in the breadcrumbs.")));
 let BreadcrumbsControl = class BreadcrumbsControl {
     static {
         BreadcrumbsControl_1 = this;
@@ -230,16 +247,16 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         this.Payload_Pick = {};
     }
     static {
-        this.CK_BreadcrumbsPossible = ( new RawContextKey("breadcrumbsPossible", false, ( localize(3354, "Whether the editor can show breadcrumbs"))));
+        this.CK_BreadcrumbsPossible = ( new RawContextKey("breadcrumbsPossible", false, ( localize(3576, "Whether the editor can show breadcrumbs"))));
     }
     static {
-        this.CK_BreadcrumbsVisible = ( new RawContextKey("breadcrumbsVisible", false, ( localize(3355, "Whether breadcrumbs are currently visible"))));
+        this.CK_BreadcrumbsVisible = ( new RawContextKey("breadcrumbsVisible", false, ( localize(3577, "Whether breadcrumbs are currently visible"))));
     }
     static {
-        this.CK_BreadcrumbsActive = ( new RawContextKey("breadcrumbsActive", false, ( localize(3356, "Whether breadcrumbs have focus"))));
+        this.CK_BreadcrumbsActive = ( new RawContextKey("breadcrumbsActive", false, ( localize(3578, "Whether breadcrumbs have focus"))));
     }
     static {
-        this.CK_BreadcrumbsHasSymbols = ( new RawContextKey("breadcrumbsHasSymbols", false, ( localize(3357, "Whether breadcrumbs contain symbol items"))));
+        this.CK_BreadcrumbsHasSymbols = ( new RawContextKey("breadcrumbsHasSymbols", false, ( localize(3579, "Whether breadcrumbs contain symbol items"))));
     }
     get onDidVisibilityChange() {
         return this._onDidVisibilityChange.event;
@@ -250,35 +267,47 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         _editorGroup,
         _contextKeyService,
         _contextViewService,
+        _contextMenuService,
         _instantiationService,
         _quickInputService,
         _fileService,
         _editorService,
+        _editorResolverService,
+        _commandService,
         _labelService,
-        configurationService,
+        _configurationService,
+        _hoverService,
         breadcrumbsService
     ) {
         this._options = _options;
         this._editorGroup = _editorGroup;
         this._contextKeyService = _contextKeyService;
         this._contextViewService = _contextViewService;
+        this._contextMenuService = _contextMenuService;
         this._instantiationService = _instantiationService;
         this._quickInputService = _quickInputService;
         this._fileService = _fileService;
         this._editorService = _editorService;
+        this._editorResolverService = _editorResolverService;
+        this._commandService = _commandService;
         this._labelService = _labelService;
+        this._configurationService = _configurationService;
+        this._hoverService = _hoverService;
         this._disposables = ( new DisposableStore());
+        this._editorTypeDisposables = this._disposables.add(( new DisposableStore()));
         this._breadcrumbsDisposables = ( new DisposableStore());
         this._model = ( new MutableDisposable());
         this._breadcrumbsPickerShowing = false;
         this._onDidVisibilityChange = this._disposables.add(( new Emitter()));
         this.domNode = createElement("div");
         this.domNode.classList.add("breadcrumbs-control");
+        this.domNode.classList.toggle("with-editor-type", !!_options.showEditorTypePicker);
         append(container, this.domNode);
-        this._cfUseQuickPick = BreadcrumbsConfig.UseQuickPick.bindTo(configurationService);
-        this._cfShowIcons = BreadcrumbsConfig.Icons.bindTo(configurationService);
-        this._cfTitleScrollbarSizing = BreadcrumbsConfig.TitleScrollbarSizing.bindTo(configurationService);
-        this._cfTitleScrollbarVisibility = BreadcrumbsConfig.TitleScrollbarVisibility.bindTo(configurationService);
+        this._cfUseQuickPick = BreadcrumbsConfig.UseQuickPick.bindTo(_configurationService);
+        this._cfShowIcons = BreadcrumbsConfig.Icons.bindTo(_configurationService);
+        this._cfShowEditorType = BreadcrumbsConfig.ShowEditorType.bindTo(_configurationService);
+        this._cfTitleScrollbarSizing = BreadcrumbsConfig.TitleScrollbarSizing.bindTo(_configurationService);
+        this._cfTitleScrollbarVisibility = BreadcrumbsConfig.TitleScrollbarVisibility.bindTo(_configurationService);
         this._labels = this._instantiationService.createInstance(ResourceLabels, DEFAULT_LABELS_CONTAINER);
         const sizing = this._cfTitleScrollbarSizing.getValue() ?? "default";
         const styles = _options.widgetStyles ?? defaultBreadcrumbsWidgetStyles;
@@ -293,6 +322,14 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         this._widget.onDidSelectItem(this._onSelectEvent, this, this._disposables);
         this._widget.onDidFocusItem(this._onFocusEvent, this, this._disposables);
         this._widget.onDidChangeFocus(this._updateCkBreadcrumbsActive, this, this._disposables);
+        if (this._options.showEditorTypePicker) {
+            this._disposables.add(this._cfShowEditorType.onDidChange(() => this._updateEditorTypeControl()));
+            this._disposables.add(_configurationService.onDidChangeConfiguration(event => {
+                if (event.affectsConfiguration(hiddenEditorTypesSettingId)) {
+                    this._updateEditorTypeControl();
+                }
+            }));
+        }
         this._ckBreadcrumbsPossible = BreadcrumbsControl_1.CK_BreadcrumbsPossible.bindTo(this._contextKeyService);
         this._ckBreadcrumbsVisible = BreadcrumbsControl_1.CK_BreadcrumbsVisible.bindTo(this._contextKeyService);
         this._ckBreadcrumbsActive = BreadcrumbsControl_1.CK_BreadcrumbsActive.bindTo(this._contextKeyService);
@@ -311,6 +348,7 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         this._ckBreadcrumbsHasSymbols.reset();
         this._cfUseQuickPick.dispose();
         this._cfShowIcons.dispose();
+        this._cfShowEditorType.dispose();
         this._cfTitleScrollbarSizing.dispose();
         this._cfTitleScrollbarVisibility.dispose();
         this._widget.dispose();
@@ -321,6 +359,13 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         return this._model.value;
     }
     layout(dim) {
+        if (dim) {
+            this._lastLayoutDimension = dim;
+        }
+        if (dim && this._editorTypeNode) {
+            const editorTypeWidth = this._editorTypeNode.offsetWidth;
+            dim = new Dimension(Math.max(0, dim.width - editorTypeWidth), dim.height);
+        }
         this._widget.layout(dim);
     }
     isHidden() {
@@ -332,6 +377,7 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         this._ckBreadcrumbsVisible.set(false);
         this._ckBreadcrumbsHasSymbols.set(false);
         this.domNode.classList.toggle("hidden", true);
+        this._hideEditorTypeControl();
         if (!wasHidden) {
             this._onDidVisibilityChange.fire();
         }
@@ -349,9 +395,13 @@ let BreadcrumbsControl = class BreadcrumbsControl {
     }
     update() {
         this._breadcrumbsDisposables.clear();
-        const uri = EditorResourceAccessor.getCanonicalUri(this._editorGroup.activeEditor, {
+        const canonicalUri = EditorResourceAccessor.getCanonicalUri(this._editorGroup.activeEditor, {
+            supportSideBySide: SideBySideEditor.PRIMARY
+        });
+        const originalUri = EditorResourceAccessor.getOriginalUri(this._editorGroup.activeEditor, {
             supportSideBySide: SideBySideEditor.PRIMARY
         });
+        const uri = originalUri ?? canonicalUri;
         const wasHidden = this.isHidden();
         if (!uri || !this._fileService.hasProvider(uri)) {
             this._ckBreadcrumbsPossible.set(false);
@@ -363,12 +413,10 @@ let BreadcrumbsControl = class BreadcrumbsControl {
                 return false;
             }
         }
-        const fileInfoUri = EditorResourceAccessor.getOriginalUri(this._editorGroup.activeEditor, {
-            supportSideBySide: SideBySideEditor.PRIMARY
-        });
         this.show();
         this._ckBreadcrumbsPossible.set(true);
-        const model = this._instantiationService.createInstance(BreadcrumbsModel, fileInfoUri ?? uri, this._editorGroup.activeEditorPane);
+        this._updateEditorTypeControl();
+        const model = this._instantiationService.createInstance(BreadcrumbsModel, uri, this._editorGroup.activeEditorPane);
         this._model.value = model;
         this.domNode.classList.toggle(
             "backslash-path",
@@ -391,7 +439,7 @@ let BreadcrumbsControl = class BreadcrumbsControl {
                 this._widget.setEnabled(false);
                 this._widget.setItems([new (class extends BreadcrumbsItem {
                     render(container) {
-                        container.textContent = ( localize(3358, "no elements"));
+                        container.textContent = ( localize(3580, "no elements"));
                     }
                     equals(other) {
                         return other === this;
@@ -434,6 +482,91 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         });
         return wasHidden !== this.isHidden();
     }
+    _updateEditorTypeControl() {
+        const previousWidth = this._editorTypeNode?.offsetWidth ?? 0;
+        const available = (this._options.showEditorTypePicker && this._cfShowEditorType.getValue()) ? this._getAvailableEditorTypes() : undefined;
+        if (!available) {
+            this._hideEditorTypeControl();
+        } else {
+            const {
+                label: editorTypeLabel,
+                hover: editorTypeHover
+            } = this._createEditorTypeControl();
+            const current = available.editors.find(editor => editor.id === available.currentId);
+            const label = current ? editorTypeDisplayLabel(current, available.isDiffEditor) : available.currentId;
+            editorTypeLabel.textContent = label;
+            editorTypeHover.update(( localize(3581, "Editor: {0}", label)));
+        }
+        const currentWidth = this._editorTypeNode?.offsetWidth ?? 0;
+        if (this._lastLayoutDimension && currentWidth !== previousWidth) {
+            this.layout(this._lastLayoutDimension);
+        }
+    }
+    _getAvailableEditorTypes() {
+        return getAvailableEditorTypes(
+            this._editorGroup.activeEditor,
+            this._editorResolverService,
+            this._configurationService.getValue(hiddenEditorTypesSettingId)
+        );
+    }
+    _createEditorTypeControl() {
+        if (this._editorTypeNode && this._editorTypeLabel && this._editorTypeHover) {
+            return {
+                label: this._editorTypeLabel,
+                hover: this._editorTypeHover
+            };
+        }
+        this._editorTypeNode = createElement("div");
+        this._editorTypeNode.classList.add("breadcrumbs-editor-type");
+        this._editorTypeNode.setAttribute("role", "button");
+        this._editorTypeLabel = createElement("span");
+        this._editorTypeLabel.classList.add("label");
+        this._editorTypeNode.appendChild(this._editorTypeLabel);
+        const editorTypeChevron = createElement("span");
+        editorTypeChevron.classList.add(...ThemeIcon.asClassNameArray(Codicon.chevronDown));
+        this._editorTypeNode.appendChild(editorTypeChevron);
+        append(this.domNode, this._editorTypeNode);
+        this._editorTypeHover = this._editorTypeDisposables.add(
+            this._hoverService.setupManagedHover(getDefaultHoverDelegate("mouse"), this._editorTypeNode, "")
+        );
+        this._editorTypeDisposables.add(
+            addDisposableListener(this._editorTypeNode, EventType.CLICK, e => {
+                EventHelper.stop(e, true);
+                this._showEditorTypePicker();
+            })
+        );
+        return {
+            label: this._editorTypeLabel,
+            hover: this._editorTypeHover
+        };
+    }
+    _hideEditorTypeControl() {
+        this._editorTypeDisposables.clear();
+        this._editorTypeNode?.remove();
+        this._editorTypeNode = undefined;
+        this._editorTypeLabel = undefined;
+        this._editorTypeHover = undefined;
+    }
+    _showEditorTypePicker() {
+        const editorTypeNode = this._editorTypeNode;
+        if (!editorTypeNode) {
+            return;
+        }
+        const available = this._getAvailableEditorTypes();
+        if (!available) {
+            return;
+        }
+        const actions = createEditorTypeActions(
+            available,
+            this._editorResolverService,
+            this._commandService,
+            this._editorService
+        );
+        this._contextMenuService.showContextMenu({
+            getAnchor: () => editorTypeNode,
+            getActions: () => actions
+        });
+    }
     _onFocusEvent(event) {
         if (event.item && this._breadcrumbsPickerShowing) {
             this._breadcrumbsPickerIgnoreOnceItem = undefined;
@@ -584,7 +717,7 @@ let BreadcrumbsControl = class BreadcrumbsControl {
         }
     }
 };
-BreadcrumbsControl = BreadcrumbsControl_1 = ( __decorate([( __param(3, IContextKeyService)), ( __param(4, IContextViewService)), ( __param(5, IInstantiationService)), ( __param(6, IQuickInputService)), ( __param(7, IFileService)), ( __param(8, IEditorService)), ( __param(9, ILabelService)), ( __param(10, IConfigurationService)), ( __param(11, IBreadcrumbsService))], BreadcrumbsControl));
+BreadcrumbsControl = BreadcrumbsControl_1 = ( __decorate([( __param(3, IContextKeyService)), ( __param(4, IContextViewService)), ( __param(5, IContextMenuService)), ( __param(6, IInstantiationService)), ( __param(7, IQuickInputService)), ( __param(8, IFileService)), ( __param(9, IEditorService)), ( __param(10, IEditorResolverService)), ( __param(11, ICommandService)), ( __param(12, ILabelService)), ( __param(13, IConfigurationService)), ( __param(14, IHoverService)), ( __param(15, IBreadcrumbsService))], BreadcrumbsControl));
 let BreadcrumbsControlFactory = class BreadcrumbsControlFactory {
     get control() {
         return this._control;
@@ -612,19 +745,26 @@ let BreadcrumbsControlFactory = class BreadcrumbsControlFactory {
         this._onDidEnablementChange = this._disposables.add(( new Emitter()));
         this._onDidVisibilityChange = this._disposables.add(( new Emitter()));
         const config = this._disposables.add(BreadcrumbsConfig.IsEnabled.bindTo(configurationService));
-        this._disposables.add(config.onDidChange(() => {
-            const value = config.getValue();
-            if (!value && this._control) {
+        const isEnabled = () => config.getValue() && this._editorGroup.groupsView.partOptions.showBreadcrumbs !== false;
+        const updateControl = () => {
+            const enabled = isEnabled();
+            if (!enabled && this._control) {
                 this._controlDisposables.clear();
                 this._control = undefined;
                 this._onDidEnablementChange.fire();
-            } else if (value && !this._control) {
+            } else if (enabled && !this._control) {
                 this._control = this.createControl();
                 this._control.update();
                 this._onDidEnablementChange.fire();
             }
+        };
+        this._disposables.add(config.onDidChange(updateControl));
+        this._disposables.add(this._editorGroup.groupsView.onDidChangeEditorPartOptions(e => {
+            if (e.oldPartOptions.showBreadcrumbs !== e.newPartOptions.showBreadcrumbs) {
+                updateControl();
+            }
         }));
-        if (config.getValue()) {
+        if (isEnabled()) {
             this._control = this.createControl();
         }
         this._disposables.add(fileService.onDidChangeFileSystemProviderRegistrations(e => {
@@ -653,13 +793,13 @@ registerAction2(class ToggleBreadcrumb extends Action2 {
     constructor() {
         super({
             id: "breadcrumbs.toggle",
-            title: ( localize2(3359, "Toggle Breadcrumbs")),
-            shortTitle: ( localize2(3360, "Breadcrumbs")),
+            title: ( localize2(3582, "Toggle Breadcrumbs")),
+            shortTitle: ( localize2(3583, "Breadcrumbs")),
             category: Categories.View,
             toggled: {
                 condition: ( ContextKeyExpr.equals("config.breadcrumbs.enabled", true)),
-                title: ( localize(3361, "Breadcrumbs")),
-                mnemonicTitle: ( localize(3362, "&&Breadcrumbs"))
+                title: ( localize(3584, "Breadcrumbs")),
+                mnemonicTitle: ( localize(3585, "&&Breadcrumbs"))
             },
             menu: [{
                 id: MenuId.CommandPalette
@@ -708,7 +848,7 @@ registerAction2(class FocusAndSelectBreadcrumbs extends Action2 {
     constructor() {
         super({
             id: "breadcrumbs.focusAndSelect",
-            title: ( localize2(3363, "Focus and Select Breadcrumbs")),
+            title: ( localize2(3586, "Focus and Select Breadcrumbs")),
             precondition: BreadcrumbsControl.CK_BreadcrumbsVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -726,7 +866,7 @@ registerAction2(class FocusBreadcrumbs extends Action2 {
     constructor() {
         super({
             id: "breadcrumbs.focus",
-            title: ( localize2(3364, "Focus Breadcrumbs")),
+            title: ( localize2(3587, "Focus Breadcrumbs")),
             precondition: BreadcrumbsControl.CK_BreadcrumbsVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -943,7 +1083,7 @@ registerAction2(class CopyBreadcrumbPath extends Action2 {
     constructor() {
         super({
             id: "breadcrumbs.copyPath",
-            title: ( localize2(3365, "Copy Breadcrumbs Path")),
+            title: ( localize2(3588, "Copy Breadcrumbs Path")),
             category: Categories.View,
             precondition: ( ContextKeyExpr.and(
                 BreadcrumbsControl.CK_BreadcrumbsVisible,

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

@@ -2,14 +2,18 @@ import { Event } from "../../../../base/common/event.js";
 import { URI } from "../../../../base/common/uri.js";
 import { IConfigurationService } from "../../../../platform/configuration/common/configuration.service.js";
 import { FileKind } from "../../../../platform/files/common/files.js";
+import { ILabelService } from "../../../../platform/label/common/label.service.js";
 import { IWorkspaceContextService } from "../../../../platform/workspace/common/workspace.service.js";
 import { IEditorPane } from "../../../common/editor.js";
 import { IOutline } from "../../../services/outline/browser/outline.js";
 import { IOutlineService } from "../../../services/outline/browser/outline.service.js";
+import { IWorkspaceFolderLabelService } from "../../../services/workspaces/common/workspaceFolderLabelService.service.js";
 export declare class FileElement {
     readonly uri: URI;
     readonly kind: FileKind;
-    constructor(uri: URI, kind: FileKind);
+    readonly label?: string | undefined;
+    constructor(uri: URI, kind: FileKind, label?: string | undefined);
+    equals(other: FileElement): boolean;
 }
 export declare class OutlineElement2 {
     readonly element: IOutline<unknown> | unknown;
@@ -20,7 +24,9 @@ export declare class BreadcrumbsModel {
     readonly resource: URI;
     readonly editor: IEditorPane | undefined;
     private readonly _workspaceService;
+    private readonly _workspaceFolderLabelService;
     private readonly _outlineService;
+    private readonly _labelService;
     private readonly _disposables;
     private _fileInfo;
     private readonly _cfgFilePath;
@@ -29,11 +35,12 @@ export declare class BreadcrumbsModel {
     private readonly _outlineDisposables;
     private readonly _onDidUpdate;
     readonly onDidUpdate: Event<this>;
-    constructor(resource: URI, editor: IEditorPane | undefined, configurationService: IConfigurationService, _workspaceService: IWorkspaceContextService, _outlineService: IOutlineService);
+    constructor(resource: URI, editor: IEditorPane | undefined, configurationService: IConfigurationService, _workspaceService: IWorkspaceContextService, _workspaceFolderLabelService: IWorkspaceFolderLabelService, _outlineService: IOutlineService, _labelService: ILabelService);
     dispose(): void;
     isRelative(): boolean;
     getElements(): ReadonlyArray<FileElement | OutlineElement2>;
     private _initFilePathInfo;
     private _onDidChangeWorkspaceFolders;
+    private _updateFileInfo;
     private _bindToEditor;
 }

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

@@ -8,16 +8,22 @@ import { matchesSomeScheme, Schemas } from '../../../../base/common/network.js';
 import { isEqual, dirname } from '../../../../base/common/resources.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { FileKind } from '../../../../platform/files/common/files.js';
+import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { WorkbenchState } from '../../../../platform/workspace/common/workspace.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { BreadcrumbsConfig } from './breadcrumbs.js';
 import { OutlineTarget } from '../../../services/outline/browser/outline.js';
 import { IOutlineService } from '../../../services/outline/browser/outline.service.js';
+import { IWorkspaceFolderLabelService } from '../../../services/workspaces/common/workspaceFolderLabelService.service.js';
 
 class FileElement {
-    constructor(uri, kind) {
+    constructor(uri, kind, label) {
         this.uri = uri;
         this.kind = kind;
+        this.label = label;
+    }
+    equals(other) {
+        return isEqual(this.uri, other.uri) && this.label === other.label;
     }
 }
 class OutlineElement2 {
@@ -27,11 +33,21 @@ class OutlineElement2 {
     }
 }
 let BreadcrumbsModel = class BreadcrumbsModel {
-    constructor(resource, editor, configurationService, _workspaceService, _outlineService) {
+    constructor(
+        resource,
+        editor,
+        configurationService,
+        _workspaceService,
+        _workspaceFolderLabelService,
+        _outlineService,
+        _labelService
+    ) {
         this.resource = resource;
         this.editor = editor;
         this._workspaceService = _workspaceService;
+        this._workspaceFolderLabelService = _workspaceFolderLabelService;
         this._outlineService = _outlineService;
+        this._labelService = _labelService;
         this._disposables = ( new DisposableStore());
         this._currentOutline = ( new MutableDisposable());
         this._outlineDisposables = ( new DisposableStore());
@@ -42,6 +58,11 @@ let BreadcrumbsModel = class BreadcrumbsModel {
         this._disposables.add(this._cfgFilePath.onDidChange(_ => this._onDidUpdate.fire(this)));
         this._disposables.add(this._cfgSymbolPath.onDidChange(_ => this._onDidUpdate.fire(this)));
         this._workspaceService.onDidChangeWorkspaceFolders(this._onDidChangeWorkspaceFolders, this, this._disposables);
+        this._disposables.add(this._labelService.onDidChangeFormatters(e => {
+            if (e.scheme === this.resource.scheme) {
+                this._updateFileInfo();
+            }
+        }));
         this._fileInfo = this._initFilePathInfo(resource);
         if (editor) {
             this._bindToEditor(editor);
@@ -59,7 +80,7 @@ let BreadcrumbsModel = class BreadcrumbsModel {
         this._onDidUpdate.dispose();
     }
     isRelative() {
-        return Boolean(this._fileInfo.folder);
+        return Boolean(this._fileInfo.folder || this._fileInfo.home);
     }
     getElements() {
         let result = [];
@@ -92,11 +113,15 @@ let BreadcrumbsModel = class BreadcrumbsModel {
         }
         const info = {
             folder: this._workspaceService.getWorkspaceFolder(uri) ?? undefined,
-            path: []
+            path: [],
+            home: this._labelService.getUriHome(uri)
         };
         let uriPrefix = uri;
         while (uriPrefix && uriPrefix.path !== "/") {
-            if (info.folder && isEqual(info.folder.uri, uriPrefix)) {
+            if ((info.folder && isEqual(info.folder.uri, uriPrefix)) || (info.home && isEqual(info.home, uriPrefix.with({
+                query: null,
+                fragment: null
+            })))) {
                 break;
             }
             info.path.unshift(( new FileElement(uriPrefix, info.path.length === 0 ? FileKind.FILE : FileKind.FOLDER)));
@@ -106,12 +131,33 @@ let BreadcrumbsModel = class BreadcrumbsModel {
                 break;
             }
         }
+        if (info.home) {
+            const separator = this._labelService.getSeparator(info.home.scheme, info.home.authority);
+            const labels = this._labelService.getUriLabel(info.home).split(separator).filter(Boolean);
+            for (let index = labels.length - 1; index >= 0; index--) {
+                info.path.unshift(( new FileElement(
+                    info.home,
+                    index === 0 ? FileKind.ROOT_FOLDER : FileKind.FOLDER,
+                    labels[index]
+                )));
+            }
+        }
         if (info.folder && this._workspaceService.getWorkbenchState() === WorkbenchState.WORKSPACE) {
-            info.path.unshift(( new FileElement(info.folder.uri, FileKind.ROOT_FOLDER)));
+            const folderCount = this._workspaceService.getWorkspace().folders.length;
+            if (folderCount > 1 || isEqual(info.folder.uri, this.resource)) {
+                info.path.unshift(( new FileElement(
+                    info.folder.uri,
+                    FileKind.ROOT_FOLDER,
+                    this._workspaceFolderLabelService.getWorkspaceFolderLabel(info.folder)
+                )));
+            }
         }
         return info;
     }
     _onDidChangeWorkspaceFolders() {
+        this._updateFileInfo();
+    }
+    _updateFileInfo() {
         this._fileInfo = this._initFilePathInfo(this.resource);
         this._onDidUpdate.fire(this);
     }
@@ -136,6 +182,6 @@ let BreadcrumbsModel = class BreadcrumbsModel {
         });
     }
 };
-BreadcrumbsModel = ( __decorate([( __param(2, IConfigurationService)), ( __param(3, IWorkspaceContextService)), ( __param(4, IOutlineService))], BreadcrumbsModel));
+BreadcrumbsModel = ( __decorate([( __param(2, IConfigurationService)), ( __param(3, IWorkspaceContextService)), ( __param(4, IWorkspaceFolderLabelService)), ( __param(5, IOutlineService)), ( __param(6, ILabelService))], BreadcrumbsModel));
 
 export { BreadcrumbsModel, FileElement, OutlineElement2 };

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

@@ -58,7 +58,7 @@ export declare class BreadcrumbsFilePicker extends BreadcrumbsPicker<IWorkspace
     private readonly _workspaceService;
     private readonly _editorService;
     constructor(parent: HTMLElement, resource: URI, instantiationService: IInstantiationService, themeService: IThemeService, configService: IConfigurationService, _workspaceService: IWorkspaceContextService, _editorService: IEditorService);
-    protected _createTree(container: HTMLElement): WorkbenchAsyncDataTree<URI | IWorkspace, IWorkspaceFolder | IFileStat, FuzzyScore>;
+    protected _createTree(container: HTMLElement): WorkbenchAsyncDataTree<IWorkspace | URI, IFileStat | IWorkspaceFolder, FuzzyScore>;
     protected _setInput(element: FileElement | OutlineElement2): Promise<void>;
     protected _previewElement(_element: unknown): IDisposable;
     protected _revealElement(element: IFileStat | IWorkspaceFolder, options: IEditorOptions, sideBySide: boolean): Promise<boolean>;

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

@@ -223,7 +223,7 @@ class FileNavigationLabelProvider {
 }
 class FileAccessibilityProvider {
     getWidgetAriaLabel() {
-        return localize(3366, "Breadcrumbs");
+        return localize(3589, "Breadcrumbs");
     }
     getAriaLabel(element) {
         return element.name;

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

@@ -1,4 +1,8 @@
 export declare const TOGGLE_DIFF_SIDE_BY_SIDE = "toggle.diff.renderSideBySide";
+export declare const SET_DIFF_VIEW_MODE_INLINE = "diffEditor.setViewMode.inline";
+export declare const SET_DIFF_VIEW_MODE_SIDE_BY_SIDE = "diffEditor.setViewMode.sideBySide";
+export declare const SET_DIFF_VIEW_MODE_AUTOMATIC = "diffEditor.setViewMode.automatic";
+export declare const DIFF_VIEW_MODE_INLINE_TEMPORARY = "diffEditor.viewMode.inlineTemporary";
 export declare const GOTO_NEXT_CHANGE = "workbench.action.compareEditor.nextChange";
 export declare const GOTO_PREVIOUS_CHANGE = "workbench.action.compareEditor.previousChange";
 export declare const DIFF_FOCUS_PRIMARY_SIDE = "workbench.action.compareEditor.focusPrimarySide";