@codingame/monaco-vscode-api 3.2.3 → 4.1.0

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

@@ -6,6 +6,7 @@ import { ConfigurationMigrationWorkbenchContribution, DynamicWorkbenchSecurityCo
 import { isStandalone } from '../../base/browser/browser.js';
 import { registerWorkbenchContribution2 } from '../common/contributions.js';
 import { defaultWindowTitle, defaultWindowTitleSeparator } from './parts/titlebar/windowTitle.js';
+import { CustomEditorLabelService } from '../services/editor/common/customEditorLabelService.js';
 const registry = ( Registry.as(Extensions$1.Configuration));
 (function registerConfiguration() {
     registerWorkbenchContribution2(ConfigurationMigrationWorkbenchContribution.ID, ConfigurationMigrationWorkbenchContribution, 4 );
@@ -144,6 +145,64 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                 )),
                 'default': true
             },
+            [CustomEditorLabelService.SETTING_ID_ENABLED]: {
+                'type': 'boolean',
+                'markdownDescription': ( localizeWithPath(
+                    'vs/workbench/browser/workbench.contribution',
+                    'workbench.editor.label.enabled',
+                    "Controls whether the custom workbench editor labels should be applied."
+                )),
+                'default': true,
+            },
+            [CustomEditorLabelService.SETTING_ID_PATTERNS]: {
+                'type': 'object',
+                'markdownDescription': (() => {
+                    let customEditorLabelDescription = ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'workbench.editor.label.patterns',
+                        "Controls the rendering of the editor label. Each __Item__ is a pattern that matches a file path. Both relative and absolute file paths are supported. In case multiple patterns match, the longest matching path will be picked. Each __Value__ is the template for the rendered editor when the __Item__ matches. Variables are substituted based on the context:"
+                    ));
+                    customEditorLabelDescription += '\n- ' + [
+                        ( localizeWithPath(
+                            'vs/workbench/browser/workbench.contribution',
+                            'workbench.editor.label.dirname',
+                            "`${dirname}`: name of the folder in which the file is located (e.g. `root/folder/file.txt -> folder`)."
+                        )),
+                        ( localizeWithPath(
+                            'vs/workbench/browser/workbench.contribution',
+                            'workbench.editor.label.nthdirname',
+                            "`${dirname(N)}`: name of the nth parent folder in which the file is located (e.g. `N=1: root/folder/file.txt -> root`)."
+                        )),
+                        ( localizeWithPath(
+                            'vs/workbench/browser/workbench.contribution',
+                            'workbench.editor.label.filename',
+                            "`${filename}`: name of the file without the file extension (e.g. `root/folder/file.txt -> file`)."
+                        )),
+                        ( localizeWithPath(
+                            'vs/workbench/browser/workbench.contribution',
+                            'workbench.editor.label.extname',
+                            "`${extname}`: the file extension (e.g. `root/folder/file.txt -> txt`)."
+                        )),
+                    ].join('\n- ');
+                    customEditorLabelDescription += '\n\n' + ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'customEditorLabelDescriptionExample',
+                        "Example: `\"**/static/**/*.html\": \"${filename} - ${dirname} (${extname})\"` will render a file `root/static/folder/file.html` as `file - folder (html)`."
+                    ));
+                    return customEditorLabelDescription;
+                })(),
+                additionalProperties: {
+                    type: 'string',
+                    markdownDescription: ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'workbench.editor.label.template',
+                        "The template which should be rendered when the pattern mtches. May include the variables ${dirname}, ${filename} and ${extname}."
+                    )),
+                    minLength: 1,
+                    pattern: '.*[a-zA-Z0-9].*'
+                },
+                'default': {}
+            },
             'workbench.editor.labelFormat': {
                 'type': 'string',
                 'enum': ['default', 'short', 'medium', 'long'],
@@ -512,7 +571,7 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                     'vs/workbench/browser/workbench.contribution',
                     { comment: ['{0}, {1} will be a setting name rendered as a link'], key: 'enablePreviewFromQuickOpen' },
                     "Controls whether editors opened from Quick Open show as preview editors. Preview editors do not stay open, and are reused until explicitly set to be kept open (via double-click or editing). When enabled, hold Ctrl before selection to open an editor as a non-preview. This value is ignored when {0} is not set to {1}.",
-                    '`#workbench.editor.enablePreview#`',
+                    '`#workbench.editor.showTabs#`',
                     '`multiple`'
                 )),
                 'default': false
@@ -523,7 +582,7 @@ const registry = ( Registry.as(Extensions$1.Configuration));
                     'vs/workbench/browser/workbench.contribution',
                     { comment: ['{0}, {1} will be a setting name rendered as a link'], key: 'enablePreviewFromCodeNavigation' },
                     "Controls whether editors remain in preview when a code navigation is started from them. Preview editors do not stay open, and are reused until explicitly set to be kept open (via double-click or editing). This value is ignored when {0} is not set to {1}.",
-                    '`#workbench.editor.enablePreview#`',
+                    '`#workbench.editor.showTabs#`',
                     '`multiple`'
                 )),
                 'default': false
@@ -962,28 +1021,33 @@ const registry = ( Registry.as(Extensions$1.Configuration));
             },
             ["workbench.activityBar.location" ]: {
                 'type': 'string',
-                'enum': ['side', 'top', 'hidden'],
-                'default': 'side',
+                'enum': ['default', 'top', 'bottom', 'hidden'],
+                'default': 'default',
                 'markdownDescription': ( localizeWithPath(
                     'vs/workbench/browser/workbench.contribution',
                     { comment: ['This is the description for a setting'], key: 'activityBarLocation' },
-                    "Controls the location of the Activity Bar. It can either show to the `side` or `top` of the Primary Side Bar or `hidden`."
+                    "Controls the location of the Activity Bar. It can either show to the `default` or `top` / `bottom` of the Primary and Secondary Side Bar or `hidden`."
                 )),
                 'enumDescriptions': [
                     ( localizeWithPath(
                         'vs/workbench/browser/workbench.contribution',
-                        'workbench.activityBar.location.side',
-                        "Show the Activity Bar to the side of the Primary Side Bar."
+                        'workbench.activityBar.location.default',
+                        "Show the Activity Bar of the Primary Side Bar on the side."
                     )),
                     ( localizeWithPath(
                         'vs/workbench/browser/workbench.contribution',
                         'workbench.activityBar.location.top',
-                        "Show the Activity Bar on top of the Primary Side Bar."
+                        "Show the Activity Bar on top of the Primary and Secondary Side Bar."
+                    )),
+                    ( localizeWithPath(
+                        'vs/workbench/browser/workbench.contribution',
+                        'workbench.activityBar.location.bottom',
+                        "Show the Activity Bar at the bottom of the Primary and Secondary Side Bar."
                     )),
                     ( localizeWithPath(
                         'vs/workbench/browser/workbench.contribution',
                         'workbench.activityBar.location.hide',
-                        "Hide the Activity Bar."
+                        "Hide the Activity Bar in the Primary and Secondary Side Bar."
                     ))
                 ],
             },
@@ -1644,6 +1708,16 @@ const registry = ( Registry.as(Extensions$1.Configuration));
             return result;
         }
     }]);
+( Registry.as(Extensions.ConfigurationMigration))
+    .registerConfigurationMigrations([{
+        key: "workbench.activityBar.location" , migrateFn: (value) => {
+            const results = [];
+            if (value === 'side') {
+                results.push(["workbench.activityBar.location" , { value: "default"  }]);
+            }
+            return results;
+        }
+    }]);
 ( Registry.as(Extensions.ConfigurationMigration))
     .registerConfigurationMigrations([{
         key: 'workbench.editor.doubleClickTabToToggleEditorGroupSizes', migrateFn: (value) => {

package/vscode/src/vs/workbench/common/component.js

@@ -4,7 +4,6 @@ class Component extends Themable {
     constructor(id, themeService, storageService) {
         super(themeService);
         this.id = id;
-        this.id = id;
         this.memento = ( new Memento(this.id, storageService));
         this._register(storageService.onWillSaveState(() => {
             this.saveState();

package/vscode/src/vs/workbench/common/contextkeys.js

@@ -89,10 +89,10 @@ const ActiveEditorReadonlyContext = ( new RawContextKey('activeEditorIsReadonly'
     'activeEditorIsReadonly',
     "Whether the active editor is read-only"
 ))));
-const ActiveCompareEditorOriginalWriteableContext = ( new RawContextKey('activeCompareEditorOriginalWritable', false, ( localizeWithPath(
+const ActiveCompareEditorCanSwapContext = ( new RawContextKey('activeCompareEditorCanSwap', false, ( localizeWithPath(
     'vs/workbench/common/contextkeys',
-    'activeCompareEditorOriginalWritable',
-    "Whether the active compare editor has a writable original side"
+    'activeCompareEditorCanSwap',
+    "Whether the active compare editor can swap sides"
 ))));
 const ActiveEditorCanToggleReadonlyContext = ( new RawContextKey('activeEditorCanToggleReadonly', true, ( localizeWithPath(
     'vs/workbench/common/contextkeys',
@@ -473,4 +473,4 @@ function applyAvailableEditorIds(contextKey, editor, editorResolverService) {
         contextKey.set(editors.join(','));
     }
 }
-export { ActiveAuxiliaryContext, ActiveCompareEditorOriginalWriteableContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorContext, ActiveEditorDirtyContext, ActiveEditorFirstInGroupContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, ActiveEditorLastInGroupContext, ActiveEditorPinnedContext, ActiveEditorReadonlyContext, ActiveEditorStickyContext, ActivePanelContext, ActiveViewletContext, AuxiliaryBarFocusContext, AuxiliaryBarVisibleContext, BannerFocused, DirtyWorkingCopiesContext, EditorGroupEditorsCountContext, EditorPartMaximizedEditorGroupContext, EditorPartMultipleEditorGroupsContext, EditorTabsVisibleContext, EditorsVisibleContext, EmbedderIdentifierContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, FocusedViewContext, HasWebFileSystemAccess, InEditorZenModeContext, IsAuxiliaryEditorPartContext, IsAuxiliaryWindowFocusedContext, IsMainEditorCenteredLayoutContext, IsMainWindowFullscreenContext, MainEditorAreaVisibleContext, MultipleEditorGroupsContext, NotificationFocusedContext, NotificationsCenterVisibleContext, NotificationsToastsVisibleContext, OpenFolderWorkspaceSupportContext, PanelAlignmentContext, PanelFocusContext, PanelMaximizedContext, PanelPositionContext, PanelVisibleContext, RemoteNameContext, ResourceContextKey, SideBarVisibleContext, SideBySideEditorActiveContext, SidebarFocusContext, SplitEditorsVertically, StatusBarFocused, TemporaryWorkspaceContext, TextCompareEditorActiveContext, TextCompareEditorVisibleContext, TitleBarStyleContext, TitleBarVisibleContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, applyAvailableEditorIds, getVisbileViewContextKey };
+export { ActiveAuxiliaryContext, ActiveCompareEditorCanSwapContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorContext, ActiveEditorDirtyContext, ActiveEditorFirstInGroupContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, ActiveEditorLastInGroupContext, ActiveEditorPinnedContext, ActiveEditorReadonlyContext, ActiveEditorStickyContext, ActivePanelContext, ActiveViewletContext, AuxiliaryBarFocusContext, AuxiliaryBarVisibleContext, BannerFocused, DirtyWorkingCopiesContext, EditorGroupEditorsCountContext, EditorPartMaximizedEditorGroupContext, EditorPartMultipleEditorGroupsContext, EditorTabsVisibleContext, EditorsVisibleContext, EmbedderIdentifierContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, FocusedViewContext, HasWebFileSystemAccess, InEditorZenModeContext, IsAuxiliaryEditorPartContext, IsAuxiliaryWindowFocusedContext, IsMainEditorCenteredLayoutContext, IsMainWindowFullscreenContext, MainEditorAreaVisibleContext, MultipleEditorGroupsContext, NotificationFocusedContext, NotificationsCenterVisibleContext, NotificationsToastsVisibleContext, OpenFolderWorkspaceSupportContext, PanelAlignmentContext, PanelFocusContext, PanelMaximizedContext, PanelPositionContext, PanelVisibleContext, RemoteNameContext, ResourceContextKey, SideBarVisibleContext, SideBySideEditorActiveContext, SidebarFocusContext, SplitEditorsVertically, StatusBarFocused, TemporaryWorkspaceContext, TextCompareEditorActiveContext, TextCompareEditorVisibleContext, TitleBarStyleContext, TitleBarVisibleContext, VirtualWorkspaceContext, WorkbenchStateContext, WorkspaceFolderCountContext, applyAvailableEditorIds, getVisbileViewContextKey };

package/vscode/src/vs/workbench/common/dialogs.js

@@ -0,0 +1,36 @@
+import { DeferredPromise } from '../../base/common/async.js';
+import { Emitter } from '../../base/common/event.js';
+import { Disposable } from '../../base/common/lifecycle.js';
+class DialogsModel extends Disposable {
+    constructor() {
+        super(...arguments);
+        this.dialogs = [];
+        this._onWillShowDialog = this._register(( new Emitter()));
+        this.onWillShowDialog = this._onWillShowDialog.event;
+        this._onDidShowDialog = this._register(( new Emitter()));
+        this.onDidShowDialog = this._onDidShowDialog.event;
+    }
+    show(dialog) {
+        const promise = ( new DeferredPromise());
+        const item = {
+            args: dialog,
+            close: result => {
+                this.dialogs.splice(0, 1);
+                if (result instanceof Error) {
+                    promise.error(result);
+                }
+                else {
+                    promise.complete(result);
+                }
+                this._onDidShowDialog.fire();
+            }
+        };
+        this.dialogs.push(item);
+        this._onWillShowDialog.fire();
+        return {
+            item,
+            result: promise.p
+        };
+    }
+}
+export { DialogsModel };

package/vscode/src/vs/workbench/common/editor/editorGroupModel.js

@@ -48,6 +48,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         this.preview = null;
         this.active = null;
         this.sticky = -1;
+        this.transient = ( new Set());
         if (isSerializedEditorGroupModel(labelOrSerializedGroup)) {
             this._id = this.deserialize(labelOrSerializedGroup);
         }
@@ -98,6 +99,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
     openEditor(candidate, options) {
         const makeSticky = options?.sticky || (typeof options?.index === 'number' && this.isSticky(options.index));
         const makePinned = options?.pinned || options?.sticky;
+        const makeTransient = !!options?.transient;
         const makeActive = options?.active || !this.activeEditor || (!makePinned && this.matches(this.preview, this.activeEditor));
         const existingEditorAndIndex = this.findEditor(candidate, options);
         if (!existingEditorAndIndex) {
@@ -141,6 +143,9 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
             if (makePinned || !this.preview) {
                 this.splice(targetIndex, false, newEditor);
             }
+            if (makeTransient) {
+                this.doSetTransient(newEditor, targetIndex, true);
+            }
             if (!makePinned) {
                 if (this.preview) {
                     const indexOfPreview = this.indexOf(this.preview);
@@ -168,6 +173,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         }
         else {
             const [existingEditor, existingEditorIndex] = existingEditorAndIndex;
+            this.doSetTransient(existingEditor, existingEditorIndex, makeTransient === false ? false : this.isTransient(existingEditor));
             if (makePinned) {
                 this.doPin(existingEditor, existingEditorIndex);
             }
@@ -193,7 +199,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
             const editorIndex = this.editors.indexOf(editor);
             if (editorIndex >= 0) {
                 const event = {
-                    kind: 13 ,
+                    kind: 14 ,
                     editor,
                     editorIndex
                 };
@@ -202,7 +208,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         }));
         listeners.add(editor.onDidChangeDirty(() => {
             const event = {
-                kind: 12 ,
+                kind: 13 ,
                 editor,
                 editorIndex: this.editors.indexOf(editor)
             };
@@ -284,6 +290,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         if (this.matches(this.preview, editor)) {
             this.preview = null;
         }
+        this.transient.delete(editor);
         this.splice(index, true);
         return { editor, sticky, editorIndex: index, context };
     }
@@ -317,7 +324,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         this._onDidModelChange.fire(event);
         if (sticky !== this.sticky) {
             const event = {
-                kind: 11 ,
+                kind: 12 ,
                 editor,
                 editorIndex: toIndex
             };
@@ -381,6 +388,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         if (this.isPinned(editor)) {
             return;
         }
+        this.setTransient(editor, false);
         this.preview = null;
         const event = {
             kind: 10 ,
@@ -442,7 +450,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         this.moveEditor(editor, newEditorIndex);
         this.sticky++;
         const event = {
-            kind: 11 ,
+            kind: 12 ,
             editor,
             editorIndex: newEditorIndex
         };
@@ -465,7 +473,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         this.moveEditor(editor, newEditorIndex);
         this.sticky--;
         const event = {
-            kind: 11 ,
+            kind: 12 ,
             editor,
             editorIndex: newEditorIndex
         };
@@ -487,6 +495,51 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         }
         return index <= this.sticky;
     }
+    setTransient(candidate, transient) {
+        if (!transient && this.transient.size === 0) {
+            return;
+        }
+        const res = this.findEditor(candidate);
+        if (!res) {
+            return;
+        }
+        const [editor, editorIndex] = res;
+        this.doSetTransient(editor, editorIndex, transient);
+        return editor;
+    }
+    doSetTransient(editor, editorIndex, transient) {
+        if (transient) {
+            if (( this.transient.has(editor))) {
+                return;
+            }
+            this.transient.add(editor);
+        }
+        else {
+            if (!( this.transient.has(editor))) {
+                return;
+            }
+            this.transient.delete(editor);
+        }
+        const event = {
+            kind: 11 ,
+            editor,
+            editorIndex
+        };
+        this._onDidModelChange.fire(event);
+    }
+    isTransient(editorOrIndex) {
+        if (this.transient.size === 0) {
+            return false;
+        }
+        let editor;
+        if (typeof editorOrIndex === 'number') {
+            editor = this.editors[editorOrIndex];
+        }
+        else {
+            editor = this.findEditor(editorOrIndex)?.[0];
+        }
+        return !!editor && ( this.transient.has(editor));
+    }
     splice(index, del, editor) {
         const editorToDeleteOrReplace = this.editors[index];
         if (del && this.isSticky(index)) {
@@ -676,6 +729,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
     dispose() {
         dispose(Array.from(this.editorListeners));
         this.editorListeners.clear();
+        this.transient.clear();
         super.dispose();
     }
 };

package/vscode/src/vs/workbench/common/editor/editorInput.d.ts

@@ -200,6 +200,16 @@ declare abstract class EditorInput extends AbstractEditorInput {
      * Returns a copy of the current editor input. Used when we can't just reuse the input
      */
     copy(): EditorInput;
+    /**
+     * Indicates if this editor can be moved to another group. By default
+     * editors can freely be moved around groups. If an editor cannot be
+     * moved, a message should be returned to show to the user.
+     *
+     * @returns `true` if the editor can be moved to the target group, or
+     * a string with a message to show to the user if the editor cannot be
+     * moved.
+     */
+    canMove(sourceGroup: GroupIdentifier, targetGroup: GroupIdentifier): true | string;
     /**
      * Returns if the other object matches this input.
      */

package/vscode/src/vs/workbench/common/editor/editorInput.js

@@ -75,6 +75,9 @@ class EditorInput extends AbstractEditorInput {
     copy() {
         return this;
     }
+    canMove(sourceGroup, targetGroup) {
+        return true;
+    }
     matches(otherInput) {
         if (isEditorInput(otherInput)) {
             return this === otherInput;

package/vscode/src/vs/workbench/common/editor/filteredEditorGroupModel.js

@@ -22,6 +22,7 @@ class FilteredEditorGroupModel extends Disposable {
     get activeEditor() { return this.model.activeEditor && this.filter(this.model.activeEditor) ? this.model.activeEditor : null; }
     get previewEditor() { return this.model.previewEditor && this.filter(this.model.previewEditor) ? this.model.previewEditor : null; }
     isPinned(editorOrIndex) { return this.model.isPinned(editorOrIndex); }
+    isTransient(editorOrIndex) { return this.model.isTransient(editorOrIndex); }
     isSticky(editorOrIndex) { return this.model.isSticky(editorOrIndex); }
     isActive(editor) { return this.model.isActive(editor); }
     isFirst(editor) {

package/vscode/src/vs/workbench/common/editor/resourceEditorInput.d.ts

@@ -6,6 +6,7 @@ import { ILabelService } from '../../../platform/label/common/label.js';
 import { IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.js';
 import { IMarkdownString } from '../../../base/common/htmlContent.js';
 import { ITextResourceConfigurationService } from '../../../editor/common/services/textResourceConfiguration.js';
+import { ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.js';
 
 /**
  * The base class for all editor inputs that open resources.
@@ -16,10 +17,11 @@ declare abstract class AbstractResourceEditorInput extends EditorInput implement
     protected readonly fileService: IFileService;
     protected readonly filesConfigurationService: IFilesConfigurationService;
     protected readonly textResourceConfigurationService: ITextResourceConfigurationService;
+    protected readonly customEditorLabelService: ICustomEditorLabelService;
     get capabilities(): EditorInputCapabilities;
     private _preferredResource;
     get preferredResource(): URI;
-    constructor(resource: URI, preferredResource: URI | undefined, labelService: ILabelService, fileService: IFileService, filesConfigurationService: IFilesConfigurationService, textResourceConfigurationService: ITextResourceConfigurationService);
+    constructor(resource: URI, preferredResource: URI | undefined, labelService: ILabelService, fileService: IFileService, filesConfigurationService: IFilesConfigurationService, textResourceConfigurationService: ITextResourceConfigurationService, customEditorLabelService: ICustomEditorLabelService);
     private registerListeners;
     private onLabelEvent;
     private updateLabel;

package/vscode/src/vs/workbench/common/editor/resourceEditorInput.js

@@ -6,6 +6,7 @@ import { isEqual, dirname } from '../../../base/common/resources.js';
 import { IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.js';
 import { isConfigured } from '../../../platform/configuration/common/configuration.js';
 import { ITextResourceConfigurationService } from '../../../editor/common/services/textResourceConfiguration.js';
+import { ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.js';
 let AbstractResourceEditorInput = class AbstractResourceEditorInput extends EditorInput {
     get capabilities() {
         let capabilities = 32 ;
@@ -23,13 +24,14 @@ let AbstractResourceEditorInput = class AbstractResourceEditorInput extends Edit
         return capabilities;
     }
     get preferredResource() { return this._preferredResource; }
-    constructor(resource, preferredResource, labelService, fileService, filesConfigurationService, textResourceConfigurationService) {
+    constructor(resource, preferredResource, labelService, fileService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService) {
         super();
         this.resource = resource;
         this.labelService = labelService;
         this.fileService = fileService;
         this.filesConfigurationService = filesConfigurationService;
         this.textResourceConfigurationService = textResourceConfigurationService;
+        this.customEditorLabelService = customEditorLabelService;
         this._name = undefined;
         this._shortDescription = undefined;
         this._mediumDescription = undefined;
@@ -44,6 +46,7 @@ let AbstractResourceEditorInput = class AbstractResourceEditorInput extends Edit
         this._register(this.labelService.onDidChangeFormatters(e => this.onLabelEvent(e.scheme)));
         this._register(this.fileService.onDidChangeFileSystemProviderRegistrations(e => this.onLabelEvent(e.scheme)));
         this._register(this.fileService.onDidChangeFileSystemProviderCapabilities(e => this.onLabelEvent(e.scheme)));
+        this._register(this.customEditorLabelService.onDidChange(() => this.updateLabel()));
     }
     onLabelEvent(scheme) {
         if (scheme === this._preferredResource.scheme) {
@@ -68,7 +71,7 @@ let AbstractResourceEditorInput = class AbstractResourceEditorInput extends Edit
     }
     getName() {
         if (typeof this._name !== 'string') {
-            this._name = this.labelService.getUriBasenameLabel(this._preferredResource);
+            this._name = this.customEditorLabelService.getName(this._preferredResource) ?? this.labelService.getUriBasenameLabel(this._preferredResource);
         }
         return this._name;
     }
@@ -152,6 +155,7 @@ AbstractResourceEditorInput = ( __decorate([
     ( __param(2, ILabelService)),
     ( __param(3, IFileService)),
     ( __param(4, IFilesConfigurationService)),
-    ( __param(5, ITextResourceConfigurationService))
+    ( __param(5, ITextResourceConfigurationService)),
+    ( __param(6, ICustomEditorLabelService))
 ], AbstractResourceEditorInput));
 export { AbstractResourceEditorInput };

package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.
 import { Event } from '../../../base/common/event.js';
 import { localizeWithPath } from '../../../nls.js';
 import { Registry } from '../../../platform/registry/common/platform.js';
-import { isResourceDiffEditorInput, isResourceDiffListEditorInput, isResourceSideBySideEditorInput, isResourceMergeEditorInput, isEditorInput, findViewStateForEditor, isResourceEditorInput, isDiffEditorInput, EditorExtensions } from '../editor.js';
+import { isResourceDiffEditorInput, isResourceMultiDiffEditorInput, isResourceSideBySideEditorInput, isResourceMergeEditorInput, isEditorInput, findViewStateForEditor, isResourceEditorInput, isDiffEditorInput, EditorExtensions } from '../editor.js';
 import { EditorInput } from './editorInput.js';
 import { IEditorService } from '../../services/editor/common/editorService.js';
 var SideBySideEditorInput_1;
@@ -153,7 +153,7 @@ let SideBySideEditorInput = class SideBySideEditorInput extends EditorInput {
                 this.editorService
             ));
         }
-        if (!isResourceDiffEditorInput(primarySaveResult) && !isResourceDiffListEditorInput(primarySaveResult) && !isResourceSideBySideEditorInput(primarySaveResult) && !isResourceMergeEditorInput(primarySaveResult)) {
+        if (!isResourceDiffEditorInput(primarySaveResult) && !isResourceMultiDiffEditorInput(primarySaveResult) && !isResourceSideBySideEditorInput(primarySaveResult) && !isResourceMergeEditorInput(primarySaveResult)) {
             return {
                 primary: primarySaveResult,
                 secondary: primarySaveResult,
@@ -213,7 +213,7 @@ let SideBySideEditorInput = class SideBySideEditorInput extends EditorInput {
         const secondaryResourceEditorInput = this.secondary.toUntyped(options);
         if (primaryResourceEditorInput && secondaryResourceEditorInput &&
             !isResourceDiffEditorInput(primaryResourceEditorInput) && !isResourceDiffEditorInput(secondaryResourceEditorInput) &&
-            !isResourceDiffListEditorInput(primaryResourceEditorInput) && !isResourceDiffListEditorInput(secondaryResourceEditorInput) &&
+            !isResourceMultiDiffEditorInput(primaryResourceEditorInput) && !isResourceMultiDiffEditorInput(secondaryResourceEditorInput) &&
             !isResourceSideBySideEditorInput(primaryResourceEditorInput) && !isResourceSideBySideEditorInput(secondaryResourceEditorInput) &&
             !isResourceMergeEditorInput(primaryResourceEditorInput) && !isResourceMergeEditorInput(secondaryResourceEditorInput)) {
             const untypedInput = {

package/vscode/src/vs/workbench/common/editor/textResourceEditorInput.d.ts

@@ -8,6 +8,7 @@ import { ILabelService } from '../../../platform/label/common/label.js';
 import '../../../editor/editor.api.js';
 import { IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.js';
 import { ITextResourceConfigurationService } from '../../../editor/common/services/textResourceConfiguration.js';
+import { ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.js';
 
 /**
  * The base class for all editor inputs that open in text editors.
@@ -15,7 +16,7 @@ import { ITextResourceConfigurationService } from '../../../editor/common/servic
 declare abstract class AbstractTextResourceEditorInput extends AbstractResourceEditorInput {
     protected readonly editorService: IEditorService;
     protected readonly textFileService: ITextFileService;
-    constructor(resource: URI, preferredResource: URI | undefined, editorService: IEditorService, textFileService: ITextFileService, labelService: ILabelService, fileService: IFileService, filesConfigurationService: IFilesConfigurationService, textResourceConfigurationService: ITextResourceConfigurationService);
+    constructor(resource: URI, preferredResource: URI | undefined, editorService: IEditorService, textFileService: ITextFileService, labelService: ILabelService, fileService: IFileService, filesConfigurationService: IFilesConfigurationService, textResourceConfigurationService: ITextResourceConfigurationService, customEditorLabelService: ICustomEditorLabelService);
     save(group: GroupIdentifier, options?: ITextFileSaveOptions): Promise<IUntypedEditorInput | undefined>;
     saveAs(group: GroupIdentifier, options?: ITextFileSaveOptions): Promise<IUntypedEditorInput | undefined>;
     private doSave;

package/vscode/src/vs/workbench/common/editor/textResourceEditorInput.js

@@ -12,10 +12,11 @@ import { TextResourceEditorModel } from './textResourceEditorModel.js';
 import { createTextBufferFactory } from '../../../editor/common/model/textModel.js';
 import { IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.js';
 import { ITextResourceConfigurationService } from '../../../editor/common/services/textResourceConfiguration.js';
+import { ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.js';
 var TextResourceEditorInput_1;
 let AbstractTextResourceEditorInput = class AbstractTextResourceEditorInput extends AbstractResourceEditorInput {
-    constructor(resource, preferredResource, editorService, textFileService, labelService, fileService, filesConfigurationService, textResourceConfigurationService) {
-        super(resource, preferredResource, labelService, fileService, filesConfigurationService, textResourceConfigurationService);
+    constructor(resource, preferredResource, editorService, textFileService, labelService, fileService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService) {
+        super(resource, preferredResource, labelService, fileService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService);
         this.editorService = editorService;
         this.textFileService = textFileService;
     }
@@ -51,7 +52,8 @@ AbstractTextResourceEditorInput = ( __decorate([
     ( __param(4, ILabelService)),
     ( __param(5, IFileService)),
     ( __param(6, IFilesConfigurationService)),
-    ( __param(7, ITextResourceConfigurationService))
+    ( __param(7, ITextResourceConfigurationService)),
+    ( __param(8, ICustomEditorLabelService))
 ], AbstractTextResourceEditorInput));
 let TextResourceEditorInput = class TextResourceEditorInput extends AbstractTextResourceEditorInput {
     static { TextResourceEditorInput_1 = this; }
@@ -62,8 +64,8 @@ let TextResourceEditorInput = class TextResourceEditorInput extends AbstractText
     get editorId() {
         return DEFAULT_EDITOR_ASSOCIATION.id;
     }
-    constructor(resource, name, description, preferredLanguageId, preferredContents, textModelService, textFileService, editorService, fileService, labelService, filesConfigurationService, textResourceConfigurationService) {
-        super(resource, undefined, editorService, textFileService, labelService, fileService, filesConfigurationService, textResourceConfigurationService);
+    constructor(resource, name, description, preferredLanguageId, preferredContents, textModelService, textFileService, editorService, fileService, labelService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService) {
+        super(resource, undefined, editorService, textFileService, labelService, fileService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService);
         this.name = name;
         this.description = description;
         this.preferredLanguageId = preferredLanguageId;
@@ -149,6 +151,7 @@ TextResourceEditorInput = TextResourceEditorInput_1 = ( __decorate([
     ( __param(8, IFileService)),
     ( __param(9, ILabelService)),
     ( __param(10, IFilesConfigurationService)),
-    ( __param(11, ITextResourceConfigurationService))
+    ( __param(11, ITextResourceConfigurationService)),
+    ( __param(12, ICustomEditorLabelService))
 ], TextResourceEditorInput));
 export { AbstractTextResourceEditorInput, TextResourceEditorInput };