@codingame/monaco-vscode-api 2.0.3-improve-modularity.1 → 2.1.0-update-vscode-1.86.1

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

@@ -27,6 +27,16 @@ const securityConfigurationNodeBase = ( Object.freeze({
     'type': 'object',
     'order': 7
 }));
+const problemsConfigurationNodeBase = ( Object.freeze({
+    'id': 'problems',
+    'title': ( localizeWithPath(
+        'vs/workbench/common/configuration',
+        'problemsConfigurationTitle',
+        "Problems"
+    )),
+    'type': 'object',
+    'order': 101
+}));
 const Extensions = {
     ConfigurationMigration: 'base.contributions.configuration.migration'
 };
@@ -93,4 +103,4 @@ let DynamicWorkbenchConfigurationWorkbenchContribution = class DynamicWorkbenchC
 DynamicWorkbenchConfigurationWorkbenchContribution = ( __decorate([
     ( __param(0, IRemoteAgentService))
 ], DynamicWorkbenchConfigurationWorkbenchContribution));
-export { DynamicWorkbenchConfigurationWorkbenchContribution, Extensions, securityConfigurationNodeBase, workbenchConfigurationNodeBase };
+export { DynamicWorkbenchConfigurationWorkbenchContribution, Extensions, problemsConfigurationNodeBase, securityConfigurationNodeBase, workbenchConfigurationNodeBase };

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

@@ -43,10 +43,10 @@ const TemporaryWorkspaceContext = ( new RawContextKey('temporaryWorkspace', fals
     'temporaryWorkspace',
     "The scheme of the current workspace is from a temporary file system."
 ))));
-const IsFullscreenContext = ( new RawContextKey('isFullscreen', false, ( localizeWithPath(
+const IsMainWindowFullscreenContext = ( new RawContextKey('isFullscreen', false, ( localizeWithPath(
     'vs/workbench/common/contextkeys',
     'isFullscreen',
-    "Whether the window is in fullscreen mode"
+    "Whether the main window is in fullscreen mode"
 ))));
 const IsAuxiliaryWindowFocusedContext = ( new RawContextKey('isAuxiliaryWindowFocusedContext', false, ( localizeWithPath(
     'vs/workbench/common/contextkeys',
@@ -89,6 +89,11 @@ const ActiveEditorReadonlyContext = ( new RawContextKey('activeEditorIsReadonly'
     'activeEditorIsReadonly',
     "Whether the active editor is read-only"
 ))));
+const ActiveCompareEditorOriginalWriteableContext = ( new RawContextKey('activeCompareEditorOriginalWritable', false, ( localizeWithPath(
+    'vs/workbench/common/contextkeys',
+    'activeCompareEditorOriginalWritable',
+    "Whether the active compare editor has a writable original side"
+))));
 const ActiveEditorCanToggleReadonlyContext = ( new RawContextKey('activeEditorCanToggleReadonly', true, ( localizeWithPath(
     'vs/workbench/common/contextkeys',
     'activeEditorCanToggleReadonly',
@@ -200,7 +205,6 @@ const EditorTabsVisibleContext = ( new RawContextKey('editorTabsVisible', true,
     'editorTabsVisible',
     "Whether editor tabs are visible"
 ))));
-const EditorPinnedAndUnpinnedTabsContext = ( new RawContextKey('editorPinnedAndUnpinnedTabsVisible', false, true));
 const SideBarVisibleContext = ( new RawContextKey('sideBarVisible', false, ( localizeWithPath(
     'vs/workbench/common/contextkeys',
     'sideBarVisible',
@@ -469,4 +473,4 @@ function applyAvailableEditorIds(contextKey, editor, editorResolverService) {
         contextKey.set(editors.join(','));
     }
 }
-export { ActiveAuxiliaryContext, ActiveEditorAvailableEditorIdsContext, ActiveEditorCanRevertContext, ActiveEditorCanSplitInGroupContext, ActiveEditorCanToggleReadonlyContext, ActiveEditorContext, ActiveEditorDirtyContext, ActiveEditorFirstInGroupContext, ActiveEditorGroupEmptyContext, ActiveEditorGroupIndexContext, ActiveEditorGroupLastContext, ActiveEditorGroupLockedContext, ActiveEditorLastInGroupContext, ActiveEditorPinnedContext, ActiveEditorReadonlyContext, ActiveEditorStickyContext, ActivePanelContext, ActiveViewletContext, AuxiliaryBarFocusContext, AuxiliaryBarVisibleContext, BannerFocused, DirtyWorkingCopiesContext, EditorGroupEditorsCountContext, EditorPartMaximizedEditorGroupContext, EditorPartMultipleEditorGroupsContext, EditorPinnedAndUnpinnedTabsContext, EditorTabsVisibleContext, EditorsVisibleContext, EmbedderIdentifierContext, EmptyWorkspaceSupportContext, EnterMultiRootWorkspaceSupportContext, FocusedViewContext, HasWebFileSystemAccess, InEditorZenModeContext, IsAuxiliaryEditorPartContext, IsAuxiliaryWindowFocusedContext, IsCenteredLayoutContext, IsFullscreenContext, 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, 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, IsCenteredLayoutContext, 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/editor/editorInput.d.ts

@@ -5,6 +5,7 @@ import { IEditorIdentifier, AbstractEditorInput, EditorInputCapabilities, Verbos
 import { ConfirmResult } from '../../../platform/dialogs/common/dialogs.js';
 import { IMarkdownString } from '../../../base/common/htmlContent.js';
 import { IDisposable } from '../../../base/common/lifecycle.js';
+import { ThemeIcon } from '../../../base/common/themables.js';
 
 interface IEditorCloseHandler {
     /**
@@ -112,6 +113,11 @@ declare abstract class EditorInput extends AbstractEditorInput {
      * Returns the aria label to be read out by a screen reader.
      */
     getAriaLabel(): string;
+    /**
+     * Returns the icon which represents this editor input.
+     * If undefined, the default icon will be used.
+     */
+    getIcon(): ThemeIcon | undefined;
     /**
      * Returns a descriptor suitable for telemetry events.
      *

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

@@ -44,6 +44,9 @@ class EditorInput extends AbstractEditorInput {
     getAriaLabel() {
         return this.getTitle(0 );
     }
+    getIcon() {
+        return undefined;
+    }
     getTelemetryDescriptor() {
         return { typeId: this.typeId };
     }

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

@@ -0,0 +1,107 @@
+import { Emitter } from '../../../base/common/event.js';
+import { Disposable } from '../../../base/common/lifecycle.js';
+class FilteredEditorGroupModel extends Disposable {
+    constructor(model) {
+        super();
+        this.model = model;
+        this._onDidModelChange = this._register(( new Emitter()));
+        this.onDidModelChange = this._onDidModelChange.event;
+        this._register(this.model.onDidModelChange(e => {
+            const candidateOrIndex = e.editorIndex ?? e.editor;
+            if (candidateOrIndex !== undefined) {
+                if (!this.filter(candidateOrIndex)) {
+                    return;
+                }
+            }
+            this._onDidModelChange.fire(e);
+        }));
+    }
+    get id() { return this.model.id; }
+    get isLocked() { return this.model.isLocked; }
+    get stickyCount() { return this.model.stickyCount; }
+    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); }
+    isSticky(editorOrIndex) { return this.model.isSticky(editorOrIndex); }
+    isActive(editor) { return this.model.isActive(editor); }
+    isFirst(editor) {
+        return this.model.isFirst(editor, this.getEditors(1 ));
+    }
+    isLast(editor) {
+        return this.model.isLast(editor, this.getEditors(1 ));
+    }
+    getEditors(order, options) {
+        const editors = this.model.getEditors(order, options);
+        return editors.filter(e => this.filter(e));
+    }
+    findEditor(candidate, options) {
+        const result = this.model.findEditor(candidate, options);
+        if (!result) {
+            return undefined;
+        }
+        return this.filter(result[1]) ? result : undefined;
+    }
+}
+class StickyEditorGroupModel extends FilteredEditorGroupModel {
+    get count() { return this.model.stickyCount; }
+    getEditors(order, options) {
+        if (options?.excludeSticky) {
+            return [];
+        }
+        if (order === 1 ) {
+            return this.model.getEditors(1 ).slice(0, this.model.stickyCount);
+        }
+        return super.getEditors(order, options);
+    }
+    isSticky(editorOrIndex) {
+        return true;
+    }
+    getEditorByIndex(index) {
+        return index < this.count ? this.model.getEditorByIndex(index) : undefined;
+    }
+    indexOf(editor, editors, options) {
+        const editorIndex = this.model.indexOf(editor, editors, options);
+        if (editorIndex < 0 || editorIndex >= this.model.stickyCount) {
+            return -1;
+        }
+        return editorIndex;
+    }
+    contains(candidate, options) {
+        const editorIndex = this.model.indexOf(candidate, undefined, options);
+        return editorIndex >= 0 && editorIndex < this.model.stickyCount;
+    }
+    filter(candidateOrIndex) {
+        return this.model.isSticky(candidateOrIndex);
+    }
+}
+class UnstickyEditorGroupModel extends FilteredEditorGroupModel {
+    get count() { return this.model.count - this.model.stickyCount; }
+    get stickyCount() { return 0; }
+    isSticky(editorOrIndex) {
+        return false;
+    }
+    getEditors(order, options) {
+        if (order === 1 ) {
+            return this.model.getEditors(1 ).slice(this.model.stickyCount);
+        }
+        return super.getEditors(order, options);
+    }
+    getEditorByIndex(index) {
+        return index >= 0 ? this.model.getEditorByIndex(index + this.model.stickyCount) : undefined;
+    }
+    indexOf(editor, editors, options) {
+        const editorIndex = this.model.indexOf(editor, editors, options);
+        if (editorIndex < this.model.stickyCount || editorIndex >= this.model.count) {
+            return -1;
+        }
+        return editorIndex - this.model.stickyCount;
+    }
+    contains(candidate, options) {
+        const editorIndex = this.model.indexOf(candidate, undefined, options);
+        return editorIndex >= this.model.stickyCount && editorIndex < this.model.count;
+    }
+    filter(candidateOrIndex) {
+        return !this.model.isSticky(candidateOrIndex);
+    }
+}
+export { StickyEditorGroupModel, UnstickyEditorGroupModel };

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

@@ -1,10 +1,11 @@
-import { EditorInputWithPreferredResource, EditorInputCapabilities, Verbosity } from '../editor.js';
+import { EditorInputWithPreferredResource, EditorInputCapabilities, Verbosity, IFileLimitedEditorInputOptions } from '../editor.js';
 import { EditorInput } from './editorInput.js';
 import { URI } from '../../../base/common/uri.js';
-import { IFileService } from '../../../platform/files/common/files.js';
+import { IFileService, IFileReadLimits } from '../../../platform/files/common/files.js';
 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';
 
 /**
  * The base class for all editor inputs that open resources.
@@ -14,10 +15,11 @@ declare abstract class AbstractResourceEditorInput extends EditorInput implement
     protected readonly labelService: ILabelService;
     protected readonly fileService: IFileService;
     protected readonly filesConfigurationService: IFilesConfigurationService;
+    protected readonly textResourceConfigurationService: ITextResourceConfigurationService;
     get capabilities(): EditorInputCapabilities;
     private _preferredResource;
     get preferredResource(): URI;
-    constructor(resource: URI, preferredResource: URI | undefined, labelService: ILabelService, fileService: IFileService, filesConfigurationService: IFilesConfigurationService);
+    constructor(resource: URI, preferredResource: URI | undefined, labelService: ILabelService, fileService: IFileService, filesConfigurationService: IFilesConfigurationService, textResourceConfigurationService: ITextResourceConfigurationService);
     private registerListeners;
     private onLabelEvent;
     private updateLabel;
@@ -39,6 +41,7 @@ declare abstract class AbstractResourceEditorInput extends EditorInput implement
     private get longTitle();
     getTitle(verbosity?: Verbosity): string;
     isReadonly(): boolean | IMarkdownString;
+    protected ensureLimits(options?: IFileLimitedEditorInputOptions): IFileReadLimits | undefined;
 }
 
 export { AbstractResourceEditorInput };

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

@@ -1,9 +1,11 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { EditorInput } from './editorInput.js';
-import { IFileService } from '../../../platform/files/common/files.js';
+import { getLargeFileConfirmationLimit, ByteSize, IFileService } from '../../../platform/files/common/files.js';
 import { ILabelService } from '../../../platform/label/common/label.js';
 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';
 let AbstractResourceEditorInput = class AbstractResourceEditorInput extends EditorInput {
     get capabilities() {
         let capabilities = 32 ;
@@ -21,12 +23,13 @@ let AbstractResourceEditorInput = class AbstractResourceEditorInput extends Edit
         return capabilities;
     }
     get preferredResource() { return this._preferredResource; }
-    constructor(resource, preferredResource, labelService, fileService, filesConfigurationService) {
+    constructor(resource, preferredResource, labelService, fileService, filesConfigurationService, textResourceConfigurationService) {
         super();
         this.resource = resource;
         this.labelService = labelService;
         this.fileService = fileService;
         this.filesConfigurationService = filesConfigurationService;
+        this.textResourceConfigurationService = textResourceConfigurationService;
         this._name = undefined;
         this._shortDescription = undefined;
         this._mediumDescription = undefined;
@@ -130,10 +133,25 @@ let AbstractResourceEditorInput = class AbstractResourceEditorInput extends Edit
     isReadonly() {
         return this.filesConfigurationService.isReadonly(this.resource);
     }
+    ensureLimits(options) {
+        if (options?.limits) {
+            return options.limits;
+        }
+        const defaultSizeLimit = getLargeFileConfirmationLimit(this.resource);
+        let configuredSizeLimit = undefined;
+        const configuredSizeLimitMb = this.textResourceConfigurationService.inspect(this.resource, null, 'workbench.editorLargeFileConfirmation');
+        if (isConfigured(configuredSizeLimitMb)) {
+            configuredSizeLimit = configuredSizeLimitMb.value * ByteSize.MB;
+        }
+        return {
+            size: configuredSizeLimit ?? defaultSizeLimit
+        };
+    }
 };
 AbstractResourceEditorInput = ( __decorate([
     ( __param(2, ILabelService)),
     ( __param(3, IFileService)),
-    ( __param(4, IFilesConfigurationService))
+    ( __param(4, IFilesConfigurationService)),
+    ( __param(5, ITextResourceConfigurationService))
 ], AbstractResourceEditorInput));
 export { AbstractResourceEditorInput };

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

@@ -7,6 +7,7 @@ import { IFileService } from '../../../platform/files/common/files.js';
 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';
 
 /**
  * The base class for all editor inputs that open in text editors.
@@ -14,7 +15,7 @@ import { IFilesConfigurationService } from '../../services/filesConfiguration/co
 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);
+    constructor(resource: URI, preferredResource: URI | undefined, editorService: IEditorService, textFileService: ITextFileService, labelService: ILabelService, fileService: IFileService, filesConfigurationService: IFilesConfigurationService, textResourceConfigurationService: ITextResourceConfigurationService);
     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

@@ -11,10 +11,11 @@ import { ITextModelService } from '../../../editor/common/services/resolverServi
 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';
 var TextResourceEditorInput_1;
 let AbstractTextResourceEditorInput = class AbstractTextResourceEditorInput extends AbstractResourceEditorInput {
-    constructor(resource, preferredResource, editorService, textFileService, labelService, fileService, filesConfigurationService) {
-        super(resource, preferredResource, labelService, fileService, filesConfigurationService);
+    constructor(resource, preferredResource, editorService, textFileService, labelService, fileService, filesConfigurationService, textResourceConfigurationService) {
+        super(resource, preferredResource, labelService, fileService, filesConfigurationService, textResourceConfigurationService);
         this.editorService = editorService;
         this.textFileService = textFileService;
     }
@@ -49,7 +50,8 @@ AbstractTextResourceEditorInput = ( __decorate([
     ( __param(3, ITextFileService)),
     ( __param(4, ILabelService)),
     ( __param(5, IFileService)),
-    ( __param(6, IFilesConfigurationService))
+    ( __param(6, IFilesConfigurationService)),
+    ( __param(7, ITextResourceConfigurationService))
 ], AbstractTextResourceEditorInput));
 let TextResourceEditorInput = class TextResourceEditorInput extends AbstractTextResourceEditorInput {
     static { TextResourceEditorInput_1 = this; }
@@ -60,8 +62,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) {
-        super(resource, undefined, editorService, textFileService, labelService, fileService, filesConfigurationService);
+    constructor(resource, name, description, preferredLanguageId, preferredContents, textModelService, textFileService, editorService, fileService, labelService, filesConfigurationService, textResourceConfigurationService) {
+        super(resource, undefined, editorService, textFileService, labelService, fileService, filesConfigurationService, textResourceConfigurationService);
         this.name = name;
         this.description = description;
         this.preferredLanguageId = preferredLanguageId;
@@ -146,6 +148,7 @@ TextResourceEditorInput = TextResourceEditorInput_1 = ( __decorate([
     ( __param(7, IEditorService)),
     ( __param(8, IFileService)),
     ( __param(9, ILabelService)),
-    ( __param(10, IFilesConfigurationService))
+    ( __param(10, IFilesConfigurationService)),
+    ( __param(11, ITextResourceConfigurationService))
 ], TextResourceEditorInput));
 export { AbstractTextResourceEditorInput, TextResourceEditorInput };

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

@@ -10,6 +10,7 @@ import { IContextKeyService } from '../../platform/contextkey/common/contextkey.
 import { IEncodingSupport, ILanguageSupport } from '../services/textfile/common/textfiles.js';
 import { IEditorGroup } from '../services/editor/common/editorGroupsService.js';
 import { IComposite, ICompositeControl } from './composite.js';
+import { IFileReadLimits } from '../../platform/files/common/files.js';
 import { IExtUri } from '../../base/common/resources.js';
 import { IAction } from '../../base/common/actions.js';
 import '../../editor/editor.api.js';
@@ -309,12 +310,16 @@ interface IResourceDiffEditorInput extends IBaseUntypedEditorInput {
  * highlighting the differences.
  */
 interface IResourceMultiDiffEditorInput extends IBaseUntypedEditorInput {
+    /**
+     * A unique identifier of this multi diff editor input.
+     * If a second multi diff editor with the same uri is opened, the existing one is revealed instead (even if the resources list is different!).
+     */
+    readonly multiDiffSource?: URI;
     /**
      * The list of resources to compare.
+     * If not set, the resources are dynamically derived from the {@link multiDiffSource}.
      */
-    readonly resources: (IResourceDiffEditorInput & {
-        readonly resource: URI;
-    })[];
+    readonly resources?: IResourceDiffEditorInput[];
 }
 type IResourceMergeEditorInputSide = (IResourceEditorInput | ITextResourceEditorInput) & {
     detail?: string;
@@ -549,6 +554,13 @@ interface IFileEditorInput extends EditorInput, IEncodingSupport, ILanguageSuppo
      */
     isResolved(): boolean;
 }
+interface IFileLimitedEditorInputOptions extends IEditorOptions {
+    /**
+     * If provided, the size of the file will be checked against the limits
+     * and an error will be thrown if any limit is exceeded.
+     */
+    readonly limits?: IFileReadLimits;
+}
 interface EditorInputWithOptions {
     editor: EditorInput;
     options?: IEditorOptions;
@@ -758,4 +770,4 @@ interface IToolbarActions {
     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 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 };
+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 IFileLimitedEditorInputOptions, 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

@@ -56,7 +56,13 @@ function isResourceDiffListEditorInput(editor) {
         return false;
     }
     const candidate = editor;
-    return Array.isArray(candidate?.resources);
+    if (!candidate) {
+        return false;
+    }
+    if (candidate.resources && !Array.isArray(candidate.resources)) {
+        return false;
+    }
+    return !!candidate.resources || !!candidate.multiDiffSource;
 }
 function isResourceSideBySideEditorInput(editor) {
     if (isEditorInput(editor)) {

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

@@ -37,11 +37,29 @@ class Memento {
             }
         }
     }
+    onDidChangeValue(scope, disposables) {
+        return this.storageService.onDidChangeValue(scope, this.id, disposables);
+    }
     saveMemento() {
         Memento.workspaceMementos.get(this.id)?.save();
         Memento.profileMementos.get(this.id)?.save();
         Memento.applicationMementos.get(this.id)?.save();
     }
+    reloadMemento(scope) {
+        let memento;
+        switch (scope) {
+            case -1 :
+                memento = Memento.applicationMementos.get(this.id);
+                break;
+            case 0 :
+                memento = Memento.profileMementos.get(this.id);
+                break;
+            case 1 :
+                memento = Memento.workspaceMementos.get(this.id);
+                break;
+        }
+        memento?.reload();
+    }
     static clear(scope) {
         switch (scope) {
             case 1 :
@@ -62,26 +80,29 @@ class ScopedMemento {
         this.scope = scope;
         this.target = target;
         this.storageService = storageService;
-        this.mementoObj = this.load();
+        this.mementoObj = this.doLoad();
+    }
+    doLoad() {
+        try {
+            return this.storageService.getObject(this.id, this.scope, {});
+        }
+        catch (error) {
+            onUnexpectedError(`[memento]: failed to parse contents: ${error} (id: ${this.id}, scope: ${this.scope}, contents: ${this.storageService.get(this.id, this.scope)})`);
+        }
+        return {};
     }
     getMemento() {
         return this.mementoObj;
     }
-    load() {
-        const memento = this.storageService.get(this.id, this.scope);
-        if (memento) {
-            try {
-                return JSON.parse(memento);
-            }
-            catch (error) {
-                onUnexpectedError(`[memento]: failed to parse contents: ${error} (id: ${this.id}, scope: ${this.scope}, contents: ${memento})`);
-            }
+    reload() {
+        for (const name of Object.getOwnPropertyNames(this.mementoObj)) {
+            delete this.mementoObj[name];
         }
-        return {};
+        Object.assign(this.mementoObj, this.doLoad());
     }
     save() {
         if (!isEmptyObject(this.mementoObj)) {
-            this.storageService.store(this.id, JSON.stringify(this.mementoObj), this.scope, this.target);
+            this.storageService.store(this.id, this.mementoObj, this.scope, this.target);
         }
         else {
             this.storageService.remove(this.id, this.scope);

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

@@ -1,4 +1,4 @@
-import { NotificationsFilter, NoOpNotification, Severity, NotificationPriority } from '../../platform/notification/common/notification.js';
+import { NotificationsFilter, NoOpNotification, NotificationPriority, Severity, isNotificationSource } from '../../platform/notification/common/notification.js';
 import { toErrorMessage, isErrorWithActions } from '../../base/common/errorMessage.js';
 import { Emitter, Event } from '../../base/common/event.js';
 import { Disposable, toDisposable } from '../../base/common/lifecycle.js';
@@ -6,6 +6,7 @@ import { isCancellationError } from '../../base/common/errors.js';
 import { Action } from '../../base/common/actions.js';
 import { equals } from '../../base/common/arrays.js';
 import { parseLinkedText } from '../../base/common/linkedText.js';
+import { mapsStrictEqualIgnoreOrder } from '../../base/common/map.js';
 class NotificationHandle extends Disposable {
     constructor(item, onClose) {
         super();
@@ -51,14 +52,31 @@ class NotificationsModel extends Disposable {
         this._onDidChangeFilter = this._register(( new Emitter()));
         this.onDidChangeFilter = this._onDidChangeFilter.event;
         this._notifications = [];
-        this.filter = NotificationsFilter.OFF;
+        this.filter = {
+            global: NotificationsFilter.OFF,
+            sources: ( new Map())
+        };
     }
     static { this.NO_OP_NOTIFICATION = ( new NoOpNotification()); }
     get notifications() { return this._notifications; }
     get statusMessage() { return this._statusMessage; }
     setFilter(filter) {
-        this.filter = filter;
-        this._onDidChangeFilter.fire(filter);
+        let globalChanged = false;
+        if (typeof filter.global === 'number') {
+            globalChanged = this.filter.global !== filter.global;
+            this.filter.global = filter.global;
+        }
+        let sourcesChanged = false;
+        if (filter.sources) {
+            sourcesChanged = !mapsStrictEqualIgnoreOrder(this.filter.sources, filter.sources);
+            this.filter.sources = filter.sources;
+        }
+        if (globalChanged || sourcesChanged) {
+            this._onDidChangeFilter.fire({
+                global: globalChanged ? filter.global : undefined,
+                sources: sourcesChanged ? filter.sources : undefined
+            });
+        }
     }
     addNotification(notification) {
         const item = this.createViewItem(notification);
@@ -178,7 +196,7 @@ class NotificationViewItemProgress extends Disposable {
 }
 class NotificationViewItem extends Disposable {
     static { this.MAX_MESSAGE_LENGTH = 1000; }
-    static create(notification, filter = NotificationsFilter.OFF) {
+    static create(notification, filter) {
         if (!notification || !notification.message || isCancellationError(notification.message)) {
             return undefined;
         }
@@ -201,8 +219,13 @@ class NotificationViewItem extends Disposable {
             actions = { primary: notification.message.actions };
         }
         let priority = notification.priority ?? NotificationPriority.DEFAULT;
-        if (priority === NotificationPriority.DEFAULT && (filter === NotificationsFilter.SILENT || (filter === NotificationsFilter.ERROR && notification.severity !== Severity.Error))) {
-            priority = NotificationPriority.SILENT;
+        if (priority === NotificationPriority.DEFAULT && severity !== Severity.Error) {
+            if (filter.global === NotificationsFilter.ERROR) {
+                priority = NotificationPriority.SILENT;
+            }
+            else if (isNotificationSource(notification.source) && filter.sources.get(notification.source.id) === NotificationsFilter.ERROR) {
+                priority = NotificationPriority.SILENT;
+            }
         }
         return ( new NotificationViewItem(
             notification.id,