@codingame/monaco-vscode-api 1.83.16 → 1.85.0-next.1

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

@@ -21,15 +21,15 @@ function isSerializedEditorGroupModel(group) {
 }
 function isGroupEditorOpenEvent(e) {
     const candidate = e;
-    return candidate.kind === 3  && candidate.editorIndex !== undefined;
+    return candidate.kind === 4  && candidate.editorIndex !== undefined;
 }
 function isGroupEditorMoveEvent(e) {
     const candidate = e;
-    return candidate.kind === 5  && candidate.editorIndex !== undefined && candidate.oldEditorIndex !== undefined;
+    return candidate.kind === 6  && candidate.editorIndex !== undefined && candidate.oldEditorIndex !== undefined;
 }
 function isGroupEditorCloseEvent(e) {
     const candidate = e;
-    return candidate.kind === 4  && candidate.editorIndex !== undefined && candidate.context !== undefined && candidate.sticky !== undefined;
+    return candidate.kind === 5  && candidate.editorIndex !== undefined && candidate.context !== undefined && candidate.sticky !== undefined;
 }
 let EditorGroupModel = class EditorGroupModel extends Disposable {
     static { EditorGroupModel_1 = this; }
@@ -153,7 +153,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
             }
             this.registerEditorListeners(newEditor);
             const event = {
-                kind: 3 ,
+                kind: 4 ,
                 editor: newEditor,
                 editorIndex: targetIndex
             };
@@ -193,7 +193,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
             const editorIndex = this.editors.indexOf(editor);
             if (editorIndex >= 0) {
                 const event = {
-                    kind: 12 ,
+                    kind: 13 ,
                     editor,
                     editorIndex
                 };
@@ -202,7 +202,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         }));
         listeners.add(editor.onDidChangeDirty(() => {
             const event = {
-                kind: 11 ,
+                kind: 12 ,
                 editor,
                 editorIndex: this.editors.indexOf(editor)
             };
@@ -210,7 +210,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         }));
         listeners.add(editor.onDidChangeLabel(() => {
             const event = {
-                kind: 7 ,
+                kind: 8 ,
                 editor,
                 editorIndex: this.editors.indexOf(editor)
             };
@@ -218,14 +218,14 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         }));
         listeners.add(editor.onDidChangeCapabilities(() => {
             const event = {
-                kind: 8 ,
+                kind: 9 ,
                 editor,
                 editorIndex: this.editors.indexOf(editor)
             };
             this._onDidModelChange.fire(event);
         }));
         listeners.add(this.onDidModelChange(event => {
-            if (event.kind === 4  && event.editor?.matches(editor)) {
+            if (event.kind === 5  && event.editor?.matches(editor)) {
                 dispose(listeners);
                 this.editorListeners.delete(listeners);
             }
@@ -236,7 +236,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         this.splice(replaceIndex, false, replaceWith);
         if (closeResult) {
             const event = {
-                kind: 4 ,
+                kind: 5 ,
                 ...closeResult
             };
             this._onDidModelChange.fire(event);
@@ -246,7 +246,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         const closeResult = this.doCloseEditor(candidate, context, openNext);
         if (closeResult) {
             const event = {
-                kind: 4 ,
+                kind: 5 ,
                 ...closeResult
             };
             this._onDidModelChange.fire(event);
@@ -309,7 +309,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         this.editors.splice(index, 1);
         this.editors.splice(toIndex, 0, editor);
         const event = {
-            kind: 5 ,
+            kind: 6 ,
             editor,
             oldEditorIndex: index,
             editorIndex: toIndex
@@ -317,7 +317,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         this._onDidModelChange.fire(event);
         if (sticky !== this.sticky) {
             const event = {
-                kind: 10 ,
+                kind: 11 ,
                 editor,
                 editorIndex: toIndex
             };
@@ -356,7 +356,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         this.mru.splice(mruIndex, 1);
         this.mru.unshift(editor);
         const event = {
-            kind: 6 ,
+            kind: 7 ,
             editor,
             editorIndex
         };
@@ -365,6 +365,9 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
     setIndex(index) {
         this._onDidModelChange.fire({ kind: 1  });
     }
+    setLabel(label) {
+        this._onDidModelChange.fire({ kind: 2  });
+    }
     pin(candidate) {
         const res = this.findEditor(candidate);
         if (!res) {
@@ -380,7 +383,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         }
         this.preview = null;
         const event = {
-            kind: 9 ,
+            kind: 10 ,
             editor,
             editorIndex
         };
@@ -402,7 +405,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         const oldPreview = this.preview;
         this.preview = editor;
         const event = {
-            kind: 9 ,
+            kind: 10 ,
             editor,
             editorIndex
         };
@@ -439,7 +442,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         this.moveEditor(editor, newEditorIndex);
         this.sticky++;
         const event = {
-            kind: 10 ,
+            kind: 11 ,
             editor,
             editorIndex: newEditorIndex
         };
@@ -462,7 +465,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
         this.moveEditor(editor, newEditorIndex);
         this.sticky--;
         const event = {
-            kind: 10 ,
+            kind: 11 ,
             editor,
             editorIndex: newEditorIndex
         };
@@ -580,7 +583,7 @@ let EditorGroupModel = class EditorGroupModel extends Disposable {
     lock(locked) {
         if (this.isLocked !== locked) {
             this.locked = locked;
-            this._onDidModelChange.fire({ kind: 2  });
+            this._onDidModelChange.fire({ kind: 3  });
         }
     }
     clone() {

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

@@ -1,9 +1,10 @@
 import { Emitter, Event } from '../../../base/common/event.js';
 import { URI } from '../../../base/common/uri.js';
-import { IEditorOptions, IEditorModel } from '../../../platform/editor/common/editor.js';
+import { IEditorOptions } from '../../../platform/editor/common/editor.js';
 import { IEditorIdentifier, AbstractEditorInput, EditorInputCapabilities, Verbosity, GroupIdentifier, ISaveOptions, IUntypedEditorInput, IRevertOptions, IMoveResult, IEditorDescriptor, IEditorPane } from '../editor.js';
 import { ConfirmResult } from '../../../platform/dialogs/common/dialogs.js';
 import { IMarkdownString } from '../../../base/common/htmlContent.js';
+import { IDisposable } from '../../../base/common/lifecycle.js';
 
 interface IEditorCloseHandler {
     /**
@@ -135,14 +136,14 @@ declare abstract class EditorInput extends AbstractEditorInput {
      */
     isSaving(): boolean;
     /**
-     * Returns a type of `IEditorModel` that represents the resolved input.
+     * Returns a type of `IDisposable` that represents the resolved input.
      * Subclasses should override to provide a meaningful model or return
      * `null` if the editor does not require a model.
      *
      * The `options` parameter are passed down from the editor when the
      * input is resolved as part of it.
      */
-    resolve(options?: IEditorOptions): Promise<IEditorModel | null>;
+    resolve(options?: IEditorOptions): Promise<IDisposable | null>;
     /**
      * Saves the editor. The provided groupId helps implementors
      * to e.g. preserve view state of the editor and re-open it

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

@@ -1,13 +1,12 @@
 import { Event } from '../../../base/common/event.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
-import { IEditorModel } from '../../../platform/editor/common/editor.js';
 
 /**
  * The editor model is the heavyweight counterpart of editor input. Depending on the editor input, it
  * resolves from a file system retrieve content and may allow for saving it back or reverting it.
  * Editor models are typically cached for some while because they are expensive to construct.
  */
-declare class EditorModel extends Disposable implements IEditorModel {
+declare class EditorModel extends Disposable {
     private readonly _onWillDispose;
     readonly onWillDispose: Event<void>;
     private resolved;

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

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.
 import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
 import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
 import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
-import { isResourceDiffEditorInput, isResourceSideBySideEditorInput, isResourceMergeEditorInput, isEditorInput, findViewStateForEditor, isResourceEditorInput, isDiffEditorInput, EditorExtensions } from '../editor.js';
+import { isResourceDiffEditorInput, isResourceDiffListEditorInput, 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;
@@ -85,10 +85,27 @@ let SideBySideEditorInput = class SideBySideEditorInput extends EditorInput {
         return this.preferredDescription;
     }
     getTitle(verbosity) {
+        let title;
         if (this.hasIdenticalSides) {
-            return this.primary.getTitle(verbosity) ?? this.getName();
+            title = this.primary.getTitle(verbosity) ?? this.getName();
         }
-        return super.getTitle(verbosity);
+        else {
+            title = super.getTitle(verbosity);
+        }
+        const preferredTitle = this.getPreferredTitle();
+        if (preferredTitle) {
+            title = `${preferredTitle} (${title})`;
+        }
+        return title;
+    }
+    getPreferredTitle() {
+        if (this.preferredName && this.preferredDescription) {
+            return `${this.preferredName} ${this.preferredDescription}`;
+        }
+        if (this.preferredName || this.preferredDescription) {
+            return this.preferredName ?? this.preferredDescription;
+        }
+        return undefined;
     }
     getLabelExtraClasses() {
         if (this.hasIdenticalSides) {
@@ -136,7 +153,7 @@ let SideBySideEditorInput = class SideBySideEditorInput extends EditorInput {
                 this.editorService
             ));
         }
-        if (!isResourceDiffEditorInput(primarySaveResult) && !isResourceSideBySideEditorInput(primarySaveResult) && !isResourceMergeEditorInput(primarySaveResult)) {
+        if (!isResourceDiffEditorInput(primarySaveResult) && !isResourceDiffListEditorInput(primarySaveResult) && !isResourceSideBySideEditorInput(primarySaveResult) && !isResourceMergeEditorInput(primarySaveResult)) {
             return {
                 primary: primarySaveResult,
                 secondary: primarySaveResult,
@@ -196,6 +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) &&
             !isResourceSideBySideEditorInput(primaryResourceEditorInput) && !isResourceSideBySideEditorInput(secondaryResourceEditorInput) &&
             !isResourceMergeEditorInput(primaryResourceEditorInput) && !isResourceMergeEditorInput(secondaryResourceEditorInput)) {
             const untypedInput = {

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

@@ -60,13 +60,13 @@ let TextResourceEditorInput = class TextResourceEditorInput extends AbstractText
     get editorId() {
         return DEFAULT_EDITOR_ASSOCIATION.id;
     }
-    constructor(resource, name, description, preferredLanguageId, preferredContents, textModelResolverService, textFileService, editorService, fileService, labelService, filesConfigurationService) {
+    constructor(resource, name, description, preferredLanguageId, preferredContents, textModelService, textFileService, editorService, fileService, labelService, filesConfigurationService) {
         super(resource, undefined, editorService, textFileService, labelService, fileService, filesConfigurationService);
         this.name = name;
         this.description = description;
         this.preferredLanguageId = preferredLanguageId;
         this.preferredContents = preferredContents;
-        this.textModelResolverService = textModelResolverService;
+        this.textModelService = textModelService;
         this.cachedModel = undefined;
         this.modelReference = undefined;
     }
@@ -104,7 +104,7 @@ let TextResourceEditorInput = class TextResourceEditorInput extends AbstractText
         this.preferredContents = undefined;
         this.preferredLanguageId = undefined;
         if (!this.modelReference) {
-            this.modelReference = this.textModelResolverService.createModelReference(this.resource);
+            this.modelReference = this.textModelService.createModelReference(this.resource);
         }
         const ref = await this.modelReference;
         const model = ref.object;

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

@@ -1,4 +1,5 @@
 import { Event } from '../../base/common/event.js';
+import { DeepRequiredNonNullable } from '../../base/common/types.js';
 import { URI } from '../../base/common/uri.js';
 import { Disposable } from '../../base/common/lifecycle.js';
 import { IDiffEditor } from '../../editor/common/editorCommon.js';
@@ -10,6 +11,7 @@ import { IEncodingSupport, ILanguageSupport } from '../services/textfile/common/
 import { IEditorGroup } from '../services/editor/common/editorGroupsService.js';
 import { IComposite, ICompositeControl } from './composite.js';
 import { IExtUri } from '../../base/common/resources.js';
+import { IAction } from '../../base/common/actions.js';
 
 interface IEditorDescriptor<T extends IEditorPane> {
     /**
@@ -301,6 +303,18 @@ interface IResourceDiffEditorInput extends IBaseUntypedEditorInput {
      */
     readonly modified: IResourceEditorInput | ITextResourceEditorInput | IUntitledTextResourceEditorInput;
 }
+/**
+ * A resource list diff editor input compares multiple resources side by side
+ * highlighting the differences.
+ */
+interface IResourceMultiDiffEditorInput extends IBaseUntypedEditorInput {
+    /**
+     * The list of resources to compare.
+     */
+    readonly resources: (IResourceDiffEditorInput & {
+        readonly resource: URI;
+    })[];
+}
 type IResourceMergeEditorInputSide = (IResourceEditorInput | ITextResourceEditorInput) & {
     detail?: string;
 };
@@ -445,9 +459,14 @@ declare const enum EditorInputCapabilities {
      * Signals that the editor cannot be in a dirty state
      * and may still have unsaved changes
      */
-    Scratchpad = 512
+    Scratchpad = 512,
+    /**
+     * Signals that the editor does not support opening in
+     * auxiliary windows yet.
+     */
+    AuxWindowUnsupported = 1024
 }
-type IUntypedEditorInput = IResourceEditorInput | ITextResourceEditorInput | IUntitledTextResourceEditorInput | IResourceDiffEditorInput | IResourceSideBySideEditorInput | IResourceMergeEditorInput;
+type IUntypedEditorInput = IResourceEditorInput | ITextResourceEditorInput | IUntitledTextResourceEditorInput | IResourceDiffEditorInput | IResourceMultiDiffEditorInput | IResourceSideBySideEditorInput | IResourceMergeEditorInput;
 declare abstract class AbstractEditorInput extends Disposable {
 }
 interface EditorInputWithPreferredResource {
@@ -610,24 +629,37 @@ type GroupIdentifier = number;
 declare const enum GroupModelChangeKind {
     GROUP_ACTIVE = 0,
     GROUP_INDEX = 1,
-    GROUP_LOCKED = 2,
-    EDITOR_OPEN = 3,
-    EDITOR_CLOSE = 4,
-    EDITOR_MOVE = 5,
-    EDITOR_ACTIVE = 6,
-    EDITOR_LABEL = 7,
-    EDITOR_CAPABILITIES = 8,
-    EDITOR_PIN = 9,
-    EDITOR_STICKY = 10,
-    EDITOR_DIRTY = 11,
-    EDITOR_WILL_DISPOSE = 12
+    GROUP_LABEL = 2,
+    GROUP_LOCKED = 3,
+    EDITOR_OPEN = 4,
+    EDITOR_CLOSE = 5,
+    EDITOR_MOVE = 6,
+    EDITOR_ACTIVE = 7,
+    EDITOR_LABEL = 8,
+    EDITOR_CAPABILITIES = 9,
+    EDITOR_PIN = 10,
+    EDITOR_STICKY = 11,
+    EDITOR_DIRTY = 12,
+    EDITOR_WILL_DISPOSE = 13
+}
+interface IEditorPartLimitConfiguration {
+    enabled?: boolean;
+    excludeDirty?: boolean;
+    value?: number;
+    perEditorGroup?: boolean;
+}
+interface IEditorPartDecorationsConfiguration {
+    badges?: boolean;
+    colors?: boolean;
 }
 interface IEditorPartConfiguration {
-    showTabs?: boolean;
+    showTabs?: 'multiple' | 'single' | 'none';
     wrapTabs?: boolean;
     scrollToSwitchTabs?: boolean;
     highlightModifiedTabs?: boolean;
-    tabCloseButton?: 'left' | 'right' | 'off';
+    tabActionLocation?: 'left' | 'right';
+    tabActionCloseVisibility?: boolean;
+    tabActionUnpinVisibility?: boolean;
     tabSizing?: 'fit' | 'shrink' | 'fixed';
     tabSizingFixedMinWidth?: number;
     tabSizingFixedMaxWidth?: number;
@@ -653,21 +685,15 @@ interface IEditorPartConfiguration {
     splitInGroupLayout?: 'vertical' | 'horizontal';
     splitSizing?: 'auto' | 'split' | 'distribute';
     splitOnDragAndDrop?: boolean;
+    dragToOpenWindow?: boolean;
     centeredLayoutFixedWidth?: boolean;
-    doubleClickTabToToggleEditorGroupSizes?: boolean;
-    limit?: {
-        enabled?: boolean;
-        excludeDirty?: boolean;
-        value?: number;
-        perEditorGroup?: boolean;
-    };
-    decorations?: {
-        badges?: boolean;
-        colors?: boolean;
-    };
-}
-interface IEditorPartOptions extends IEditorPartConfiguration {
-    hasIcons?: boolean;
+    doubleClickTabToToggleEditorGroupSizes?: 'maximize' | 'expand' | 'off';
+    editorActionsLocation?: 'default' | 'titleBar' | 'hidden';
+    limit?: IEditorPartLimitConfiguration;
+    decorations?: IEditorPartDecorationsConfiguration;
+}
+interface IEditorPartOptions extends DeepRequiredNonNullable<IEditorPartConfiguration> {
+    hasIcons: boolean;
 }
 interface IEditorPartOptionsChangeEvent {
     oldPartOptions: IEditorPartOptions;
@@ -726,5 +752,9 @@ declare const enum EditorsOrder {
      */
     SEQUENTIAL = 1
 }
+interface IToolbarActions {
+    readonly primary: IAction[];
+    readonly secondary: IAction[];
+}
 
-export { AbstractEditorInput, CloseDirection, EditorCloseContext, EditorInputCapabilities, type EditorInputWithOptions, type EditorInputWithOptionsAndGroup, type EditorInputWithPreferredResource, EditorPaneSelectionChangeReason, EditorPaneSelectionCompareResult, EditorsOrder, type GroupIdentifier, GroupModelChangeKind, type IActiveEditorChangeEvent, type IEditorCloseEvent, type IEditorControl, type IEditorDescriptor, type IEditorIdentifier, type IEditorMemento, type IEditorOpenContext, type IEditorPane, type IEditorPaneSelection, type IEditorPaneSelectionChangeEvent, type IEditorPartOptions, type IEditorPartOptionsChangeEvent, type IEditorSerializer, type IEditorWillMoveEvent, type IEditorWillOpenEvent, type IFileEditorInput, type IFindEditorOptions, type IMatchEditorOptions, type IMoveResult, type IResourceDiffEditorInput, type IResourceMergeEditorInput, type IResourceMergeEditorInputSide, type IResourceSideBySideEditorInput, type IRevertOptions, type ISaveOptions, type ITextDiffEditorPane, type IUntitledTextResourceEditorInput, type IUntypedEditorInput, type IUntypedFileEditorInput, type IVisibleEditorPane, type PreventPinnedEditorClose, SaveReason, type SaveSource, SideBySideEditor, Verbosity };
+export { AbstractEditorInput, CloseDirection, EditorCloseContext, EditorInputCapabilities, type EditorInputWithOptions, type EditorInputWithOptionsAndGroup, type EditorInputWithPreferredResource, EditorPaneSelectionChangeReason, EditorPaneSelectionCompareResult, EditorsOrder, type GroupIdentifier, GroupModelChangeKind, type IActiveEditorChangeEvent, type IEditorCloseEvent, type IEditorControl, type IEditorDescriptor, type IEditorIdentifier, type IEditorMemento, type IEditorOpenContext, type IEditorPane, type IEditorPaneSelection, type IEditorPaneSelectionChangeEvent, type IEditorPartOptions, type IEditorPartOptionsChangeEvent, type IEditorSerializer, type IEditorWillMoveEvent, type IEditorWillOpenEvent, type IFileEditorInput, type IFindEditorOptions, type IMatchEditorOptions, type IMoveResult, type IResourceDiffEditorInput, type IResourceMergeEditorInput, type IResourceMergeEditorInputSide, type IResourceMultiDiffEditorInput, type IResourceSideBySideEditorInput, type IRevertOptions, type ISaveOptions, type ITextDiffEditorPane, type IToolbarActions, type IUntitledTextResourceEditorInput, type IUntypedEditorInput, type IUntypedFileEditorInput, type IVisibleEditorPane, type PreventPinnedEditorClose, SaveReason, type SaveSource, SideBySideEditor, Verbosity };

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

@@ -51,6 +51,13 @@ function isResourceDiffEditorInput(editor) {
     const candidate = editor;
     return candidate?.original !== undefined && candidate.modified !== undefined;
 }
+function isResourceDiffListEditorInput(editor) {
+    if (isEditorInput(editor)) {
+        return false;
+    }
+    const candidate = editor;
+    return Array.isArray(candidate?.resources);
+}
 function isResourceSideBySideEditorInput(editor) {
     if (isEditorInput(editor)) {
         return false;
@@ -107,6 +114,7 @@ var EditorInputCapabilities;
     EditorInputCapabilities[EditorInputCapabilities["CanDropIntoEditor"] = 128] = "CanDropIntoEditor";
     EditorInputCapabilities[EditorInputCapabilities["MultipleEditors"] = 256] = "MultipleEditors";
     EditorInputCapabilities[EditorInputCapabilities["Scratchpad"] = 512] = "Scratchpad";
+    EditorInputCapabilities[EditorInputCapabilities["AuxWindowUnsupported"] = 1024] = "AuxWindowUnsupported";
 })(EditorInputCapabilities || (EditorInputCapabilities = {})));
 class AbstractEditorInput extends Disposable {
 }
@@ -201,7 +209,7 @@ class EditorResourceAccessorImpl {
                 editor = options.supportSideBySide === SideBySideEditor.PRIMARY ? primary : secondary;
             }
         }
-        if (isResourceDiffEditorInput(editor) || isResourceSideBySideEditorInput(editor) || isResourceMergeEditorInput(editor)) {
+        if (isResourceDiffEditorInput(editor) || isResourceDiffListEditorInput(editor) || isResourceSideBySideEditorInput(editor) || isResourceMergeEditorInput(editor)) {
             return undefined;
         }
         const originalResource = isEditorInputWithPreferredResource(editor) ? editor.preferredResource : editor.resource;
@@ -241,7 +249,7 @@ class EditorResourceAccessorImpl {
                 editor = options.supportSideBySide === SideBySideEditor.PRIMARY ? primary : secondary;
             }
         }
-        if (isResourceDiffEditorInput(editor) || isResourceSideBySideEditorInput(editor) || isResourceMergeEditorInput(editor)) {
+        if (isResourceDiffEditorInput(editor) || isResourceDiffListEditorInput(editor) || isResourceSideBySideEditorInput(editor) || isResourceMergeEditorInput(editor)) {
             return undefined;
         }
         const canonicalResource = editor.resource;
@@ -404,4 +412,4 @@ function createEditorOpenError(messageOrError, actions, options) {
     error.allowDialog = options?.allowDialog;
     return error;
 }
-export { AbstractEditorInput, BINARY_DIFF_EDITOR_ID, CloseDirection, DEFAULT_EDITOR_ASSOCIATION, EditorCloseContext, EditorCloseMethod, EditorExtensions, EditorInputCapabilities, EditorResourceAccessor, EditorsOrder, SIDE_BY_SIDE_EDITOR_ID, SaveSourceRegistry, SideBySideEditor, TEXT_DIFF_EDITOR_ID, createEditorOpenError, createTooLargeFileError, findViewStateForEditor, isDiffEditorInput, isEditorIdentifier, isEditorInput, isEditorInputWithOptions, isEditorInputWithOptionsAndGroup, isEditorOpenError, isEditorPaneWithSelection, isResourceDiffEditorInput, isResourceEditorInput, isResourceMergeEditorInput, isResourceSideBySideEditorInput, isSideBySideEditorInput, isTextEditorViewState, isUntitledResourceEditorInput, pathsToEditors, preventEditorClose };
+export { AbstractEditorInput, BINARY_DIFF_EDITOR_ID, CloseDirection, DEFAULT_EDITOR_ASSOCIATION, EditorCloseContext, EditorCloseMethod, EditorExtensions, EditorInputCapabilities, EditorResourceAccessor, EditorsOrder, SIDE_BY_SIDE_EDITOR_ID, SaveSourceRegistry, SideBySideEditor, TEXT_DIFF_EDITOR_ID, createEditorOpenError, createTooLargeFileError, findViewStateForEditor, isDiffEditorInput, isEditorIdentifier, isEditorInput, isEditorInputWithOptions, isEditorInputWithOptionsAndGroup, isEditorOpenError, isEditorPaneWithSelection, isResourceDiffEditorInput, isResourceDiffListEditorInput, isResourceEditorInput, isResourceMergeEditorInput, isResourceSideBySideEditorInput, isSideBySideEditorInput, isTextEditorViewState, isUntitledResourceEditorInput, pathsToEditors, preventEditorClose };

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

@@ -312,7 +312,7 @@ const EDITOR_GROUP_HEADER_NO_TABS_BACKGROUND = registerColor('editorGroupHeader.
 }, ( localizeWithPath(
     'vs/workbench/common/theme',
     'editorGroupHeaderBackground',
-    "Background color of the editor group title header when tabs are disabled (`\"workbench.editor.showTabs\": false`). Editor groups are the containers of editors."
+    "Background color of the editor group title header when (`\"workbench.editor.showTabs\": \"single\"`). Editor groups are the containers of editors."
 )));
 const EDITOR_GROUP_HEADER_BORDER = registerColor('editorGroupHeader.border', {
     dark: null,
@@ -1185,7 +1185,7 @@ registerColor('commandCenter.activeBackground', { dark: ( Color.white.transparen
     'commandCenter-activeBackground',
     "Active background color of the command center"
 )), false);
-registerColor('commandCenter.border', { dark: ( transparent(TITLE_BAR_ACTIVE_FOREGROUND, .20)), hcDark: ( transparent(TITLE_BAR_ACTIVE_FOREGROUND, .60)), light: ( transparent(TITLE_BAR_ACTIVE_FOREGROUND, .20)), hcLight: ( transparent(TITLE_BAR_ACTIVE_FOREGROUND, .60)) }, ( localizeWithPath(
+registerColor('commandCenter.border', { dark: ( transparent(TITLE_BAR_ACTIVE_FOREGROUND, .20)), hcDark: contrastBorder, light: ( transparent(TITLE_BAR_ACTIVE_FOREGROUND, .20)), hcLight: contrastBorder }, ( localizeWithPath(
     'vs/workbench/common/theme',
     'commandCenter-border',
     "Border color of the command center"

package/vscode/src/vs/workbench/common/views.d.ts

@@ -82,7 +82,7 @@ interface ViewContainer extends IViewContainerDescriptor {
 interface IViewDescriptor {
     readonly type?: string;
     readonly id: string;
-    readonly name: string;
+    readonly name: ILocalizedString;
     readonly ctorDescriptor: SyncDescriptor<IView>;
     readonly when?: ContextKeyExpression;
     readonly order?: number;
@@ -214,7 +214,7 @@ interface IViewDescriptorService {
         from: ViewContainerLocation;
         to: ViewContainerLocation;
     }>;
-    moveViewContainerToLocation(viewContainer: ViewContainer, location: ViewContainerLocation, requestedIndex?: number): void;
+    moveViewContainerToLocation(viewContainer: ViewContainer, location: ViewContainerLocation, requestedIndex?: number, reason?: string): void;
     getViewContainerBadgeEnablementState(id: string): boolean;
     setViewContainerBadgeEnablementState(id: string, badgesEnabled: boolean): void;
     getViewDescriptorById(id: string): IViewDescriptor | null;
@@ -226,13 +226,13 @@ interface IViewDescriptorService {
         from: ViewContainer;
         to: ViewContainer;
     }>;
-    moveViewsToContainer(views: IViewDescriptor[], viewContainer: ViewContainer, visibilityState?: ViewVisibilityState): void;
+    moveViewsToContainer(views: IViewDescriptor[], viewContainer: ViewContainer, visibilityState?: ViewVisibilityState, reason?: string): void;
     readonly onDidChangeLocation: Event<{
         views: IViewDescriptor[];
         from: ViewContainerLocation;
         to: ViewContainerLocation;
     }>;
-    moveViewToLocation(view: IViewDescriptor, location: ViewContainerLocation): void;
+    moveViewToLocation(view: IViewDescriptor, location: ViewContainerLocation, reason?: string): void;
     reset(): void;
 }
 interface IEditableData {

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

@@ -8,6 +8,8 @@ import { flatten } from 'monaco-editor/esm/vs/base/common/arrays.js';
 import { mixin } from 'monaco-editor/esm/vs/base/common/objects.js';
 import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
 import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
+const VIEWS_LOG_ID = 'views';
+const VIEWS_LOG_NAME = ( localizeWithPath('vs/workbench/common/views', 'views log', "Views"));
 const defaultViewIcon = registerIcon('default-view-icon', Codicon.window, ( localizeWithPath('vs/workbench/common/views', 'defaultViewIcon', 'Default view icon.')));
 var Extensions;
 ( (function(Extensions) {
@@ -299,4 +301,4 @@ class NoTreeViewError extends Error {
         return err.name === 'NoTreeViewError';
     }
 }
-export { Extensions, IViewDescriptorService, IViewsService, NoTreeViewError, ResolvableTreeItem, TreeItemCollapsibleState, ViewContainerLocation, ViewContainerLocationToString, ViewContainerLocations, ViewContentGroups, ViewVisibilityState, defaultViewIcon };
+export { Extensions, IViewDescriptorService, IViewsService, NoTreeViewError, ResolvableTreeItem, TreeItemCollapsibleState, VIEWS_LOG_ID, VIEWS_LOG_NAME, ViewContainerLocation, ViewContainerLocationToString, ViewContainerLocations, ViewContentGroups, ViewVisibilityState, defaultViewIcon };