@codingame/monaco-vscode-api 32.0.2 → 33.0.4

package/vscode/src/vs/workbench/contrib/comments/browser/reactionsAction.js

@@ -11,7 +11,7 @@ class ToggleReactionsAction extends Action {
         this.ID = "toolbar.toggle.pickReactions";
     }
     constructor(toggleDropdownMenu, title) {
-        super(ToggleReactionsAction.ID, title || ( localize(8461, "Pick Reactions...")), "toggle-reactions", true);
+        super(ToggleReactionsAction.ID, title || ( localize(8545, "Pick Reactions...")), "toggle-reactions", true);
         this._menuActions = [];
         this.toggleDropdownMenu = toggleDropdownMenu;
     }
@@ -53,15 +53,15 @@ class ReactionActionViewItem extends ActionViewItem {
     }
     getTooltip() {
         const action = this.action;
-        const toggleMessage = action.enabled ? ( localize(8462, "Toggle reaction, ")) : "";
+        const toggleMessage = action.enabled ? ( localize(8546, "Toggle reaction, ")) : "";
         if (action.count === undefined) {
-            return localize(8463, "{0}{1} reaction", toggleMessage, action.label);
+            return localize(8547, "{0}{1} reaction", toggleMessage, action.label);
         } else if (action.reactors === undefined || action.reactors.length === 0) {
             if (action.count === 1) {
-                return localize(8464, "{0}1 reaction with {1}", toggleMessage, action.label);
+                return localize(8548, "{0}1 reaction with {1}", toggleMessage, action.label);
             } else if (action.count > 1) {
                 return localize(
-                    8465,
+                    8549,
                     "{0}{1} reactions with {2}",
                     toggleMessage,
                     action.count,
@@ -71,7 +71,7 @@ class ReactionActionViewItem extends ActionViewItem {
         } else {
             if (action.reactors.length <= 10 && action.reactors.length === action.count) {
                 return localize(
-                    8466,
+                    8550,
                     "{0}{1} reacted with {2}",
                     toggleMessage,
                     action.reactors.join(", "),
@@ -80,7 +80,7 @@ class ReactionActionViewItem extends ActionViewItem {
             } else if (action.count > 1) {
                 const displayedReactors = action.reactors.slice(0, 10);
                 return localize(
-                    8467,
+                    8551,
                     "{0}{1} and {2} more reacted with {3}",
                     toggleMessage,
                     displayedReactors.join(", "),

package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js

@@ -5,54 +5,54 @@ import { RawContextKey } from '../../../../platform/contextkey/common/contextkey
 var CommentContextKeys;
 (function(CommentContextKeys) {
     CommentContextKeys.activeCursorHasCommentingRange = ( new RawContextKey("activeCursorHasCommentingRange", false, {
-        description: ( localize(8468, "Whether the position at the active cursor has a commenting range")),
+        description: ( localize(8552, "Whether the position at the active cursor has a commenting range")),
         type: "boolean"
     }));
     CommentContextKeys.activeCursorHasComment = ( new RawContextKey("activeCursorHasComment", false, {
-        description: ( localize(8469, "Whether the position at the active cursor has a comment")),
+        description: ( localize(8553, "Whether the position at the active cursor has a comment")),
         type: "boolean"
     }));
     CommentContextKeys.activeEditorHasCommentingRange = ( new RawContextKey("activeEditorHasCommentingRange", false, {
-        description: ( localize(8470, "Whether the active editor has a commenting range")),
+        description: ( localize(8554, "Whether the active editor has a commenting range")),
         type: "boolean"
     }));
     CommentContextKeys.WorkspaceHasCommenting = ( new RawContextKey("workspaceHasCommenting", false, {
         description: ( localize(
-            8471,
+            8555,
             "Whether the open workspace has either comments or commenting ranges."
         )),
         type: "boolean"
     }));
     CommentContextKeys.commentThreadIsEmpty = ( new RawContextKey("commentThreadIsEmpty", false, {
         type: "boolean",
-        description: ( localize(8472, "Set when the comment thread has no comments"))
+        description: ( localize(8556, "Set when the comment thread has no comments"))
     }));
     CommentContextKeys.commentIsEmpty = ( new RawContextKey("commentIsEmpty", false, {
         type: "boolean",
-        description: ( localize(8473, "Set when the comment has no input"))
+        description: ( localize(8557, "Set when the comment has no input"))
     }));
     CommentContextKeys.commentContext = ( new RawContextKey("comment", undefined, {
         type: "string",
-        description: ( localize(8474, "The context value of the comment"))
+        description: ( localize(8558, "The context value of the comment"))
     }));
     CommentContextKeys.commentThreadContext = ( new RawContextKey("commentThread", undefined, {
         type: "string",
-        description: ( localize(8475, "The context value of the comment thread"))
+        description: ( localize(8559, "The context value of the comment thread"))
     }));
     CommentContextKeys.commentControllerContext = ( new RawContextKey("commentController", undefined, {
         type: "string",
-        description: ( localize(8476, "The comment controller id associated with a comment thread"))
+        description: ( localize(8560, "The comment controller id associated with a comment thread"))
     }));
     CommentContextKeys.commentFocused = ( new RawContextKey("commentFocused", false, {
         type: "boolean",
-        description: ( localize(8477, "Set when the comment is focused"))
+        description: ( localize(8561, "Set when the comment is focused"))
     }));
     CommentContextKeys.commentWidgetVisible = ( new RawContextKey("commentWidgetVisible", false, {
         type: "boolean",
-        description: ( localize(8478, "Set when a comment widget is visible in the editor"))
+        description: ( localize(8562, "Set when a comment widget is visible in the editor"))
     }));
     CommentContextKeys.commentingEnabled = ( new RawContextKey("commentingEnabled", true, {
-        description: ( localize(8479, "Whether commenting functionality is enabled")),
+        description: ( localize(8563, "Whether commenting functionality is enabled")),
         type: "boolean"
     }));
 })(CommentContextKeys || (CommentContextKeys = {}));

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorDiffInput.d.ts

@@ -4,7 +4,7 @@ import { IFileDialogService } from "../../../../platform/dialogs/common/dialogs.
 import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
 import { IThemeService } from "../../../../platform/theme/common/themeService.service.js";
 import { IUndoRedoService } from "../../../../platform/undoRedo/common/undoRedo.service.js";
-import { EditorInputCapabilities, GroupIdentifier, IDiffEditorInput, IResourceDiffEditorInput, IRevertOptions, ISaveOptions, IUntypedEditorInput, Verbosity } from "../../../common/editor.js";
+import { EditorInputCapabilities, GroupIdentifier, IResourceDiffEditorInput, IRevertOptions, ISaveOptions, IUntypedEditorInput, Verbosity } from "../../../common/editor.js";
 import { EditorInput, IUntypedEditorOptions } from "../../../common/editor/editorInput.js";
 import { IEditorGroup } from "../../../services/editor/common/editorGroupsService.js";
 import { IFilesConfigurationService } from "../../../services/filesConfiguration/common/filesConfigurationService.service.js";
@@ -26,20 +26,17 @@ interface CustomEditorSideBySideDiffInputInitInfo extends CustomEditorDiffInputI
     readonly side: CustomEditorSideBySideDiffSide;
 }
 export type CustomEditorSideBySideDiffSide = "original" | "modified";
-export declare class CustomEditorDiffInput extends LazilyResolvedWebviewEditorInput implements IDiffEditorInput {
+export declare class CustomEditorDiffInput extends LazilyResolvedWebviewEditorInput {
     private readonly init;
-    readonly original: EditorInput;
-    readonly modified: EditorInput;
     private readonly instantiationService;
     private readonly customEditorService;
     private readonly filesConfigurationService;
     private readonly fileDialogService;
     private readonly undoRedoService;
-    private _modelRef?;
+    private readonly _modelRef;
     static create(instantiationService: IInstantiationService, init: CustomEditorDiffInputInitInfo, group: IEditorGroup | undefined): CustomEditorDiffInput;
     static readonly typeId = "workbench.editors.customDiffEditor";
-    constructor(init: CustomEditorDiffInputInitInfo, original: EditorInput, modified: EditorInput, webview: IOverlayWebview, themeService: IThemeService, webviewWorkbenchService: IWebviewWorkbenchService, instantiationService: IInstantiationService, customEditorService: ICustomEditorService, filesConfigurationService: IFilesConfigurationService, fileDialogService: IFileDialogService, undoRedoService: IUndoRedoService);
-    dispose(): void;
+    constructor(init: CustomEditorDiffInputInitInfo, webview: IOverlayWebview, themeService: IThemeService, webviewWorkbenchService: IWebviewWorkbenchService, instantiationService: IInstantiationService, customEditorService: ICustomEditorService, filesConfigurationService: IFilesConfigurationService, fileDialogService: IFileDialogService, undoRedoService: IUndoRedoService);
     get typeId(): string;
     get editorId(): string;
     get capabilities(): EditorInputCapabilities;
@@ -64,17 +61,15 @@ export declare class CustomEditorDiffInput extends LazilyResolvedWebviewEditorIn
 }
 export declare class CustomEditorSideBySideDiffInput extends LazilyResolvedWebviewEditorInput {
     private readonly init;
-    private readonly sideInput;
     private readonly instantiationService;
     private readonly customEditorService;
     private readonly filesConfigurationService;
     private readonly fileDialogService;
     private readonly undoRedoService;
-    private _modelRef?;
+    private readonly _modelRef;
     static create(instantiationService: IInstantiationService, init: CustomEditorSideBySideDiffInputInitInfo, group: IEditorGroup | undefined): CustomEditorSideBySideDiffInput;
     static readonly typeId = "workbench.editors.customSideBySideDiffEditor";
-    constructor(init: CustomEditorSideBySideDiffInputInitInfo, sideInput: EditorInput, webview: IOverlayWebview, themeService: IThemeService, webviewWorkbenchService: IWebviewWorkbenchService, instantiationService: IInstantiationService, customEditorService: ICustomEditorService, filesConfigurationService: IFilesConfigurationService, fileDialogService: IFileDialogService, undoRedoService: IUndoRedoService);
-    dispose(): void;
+    constructor(init: CustomEditorSideBySideDiffInputInitInfo, webview: IOverlayWebview, themeService: IThemeService, webviewWorkbenchService: IWebviewWorkbenchService, instantiationService: IInstantiationService, customEditorService: ICustomEditorService, filesConfigurationService: IFilesConfigurationService, fileDialogService: IFileDialogService, undoRedoService: IUndoRedoService);
     get typeId(): string;
     get editorId(): string;
     get capabilities(): EditorInputCapabilities;
@@ -84,7 +79,7 @@ export declare class CustomEditorSideBySideDiffInput extends LazilyResolvedWebvi
     get side(): CustomEditorSideBySideDiffSide;
     get diffId(): string;
     getName(): string;
-    getDescription(verbosity?: Verbosity): string | undefined;
+    getDescription(_verbosity?: Verbosity): string | undefined;
     getTitle(verbosity?: Verbosity): string;
     isReadonly(): boolean | IMarkdownString;
     isDirty(): boolean;

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorDiffInput.js

@@ -1,6 +1,7 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { isEqual } from '../../../../base/common/resources.js';
+import { basename, isEqual } from '../../../../base/common/resources.js';
+import { MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { localize } from '../../../../nls.js';
 import { IFileDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -8,26 +9,21 @@ import { IThemeService } from '../../../../platform/theme/common/themeService.se
 import { IUndoRedoService } from '../../../../platform/undoRedo/common/undoRedo.service.js';
 import { EditorInputCapabilities, isEditorInput, isResourceDiffEditorInput, isResourceEditorInput } from '../../../common/editor.js';
 import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.service.js';
-import { ITextEditorService } from '../../../services/textfile/common/textEditorService.service.js';
 import { ICustomEditorService } from '../common/customEditor.service.js';
 import { IWebviewService } from '../../webview/browser/webview.service.js';
 import { LazilyResolvedWebviewEditorInput } from '../../webviewPanel/browser/webviewWorkbenchService.js';
 import { IWebviewWorkbenchService } from '../../webviewPanel/browser/webviewWorkbenchService.service.js';
 
 var CustomEditorDiffInput_1, CustomEditorSideBySideDiffInput_1;
+function getCustomEditorSideBySideDiffInputResource(init) {
+    return init.side === "original" ? init.originalResource : init.modifiedResource;
+}
 let CustomEditorDiffInput = class CustomEditorDiffInput extends LazilyResolvedWebviewEditorInput {
     static {
         CustomEditorDiffInput_1 = this;
     }
     static create(instantiationService, init, group) {
         return instantiationService.invokeFunction(accessor => {
-            const textEditorService = accessor.get(ITextEditorService);
-            const original = textEditorService.createTextEditor({
-                resource: init.originalResource
-            });
-            const modified = textEditorService.createTextEditor({
-                resource: init.modifiedResource
-            });
             const webview = accessor.get(IWebviewService).createWebviewOverlay({
                 providedViewType: init.viewType,
                 title: init.label,
@@ -35,7 +31,7 @@ let CustomEditorDiffInput = class CustomEditorDiffInput extends LazilyResolvedWe
                 contentOptions: {},
                 extension: undefined
             });
-            const input = instantiationService.createInstance(CustomEditorDiffInput_1, init, original, modified, webview);
+            const input = instantiationService.createInstance(CustomEditorDiffInput_1, init, webview);
             if (group) {
                 input.updateGroup(group.id);
             }
@@ -47,8 +43,6 @@ let CustomEditorDiffInput = class CustomEditorDiffInput extends LazilyResolvedWe
     }
     constructor(
         init,
-        original,
-        modified,
         webview,
         themeService,
         webviewWorkbenchService,
@@ -65,22 +59,16 @@ let CustomEditorDiffInput = class CustomEditorDiffInput extends LazilyResolvedWe
             iconPath: init.iconPath
         }, webview, themeService, webviewWorkbenchService);
         this.init = init;
-        this.original = original;
-        this.modified = modified;
         this.instantiationService = instantiationService;
         this.customEditorService = customEditorService;
         this.filesConfigurationService = filesConfigurationService;
         this.fileDialogService = fileDialogService;
         this.undoRedoService = undoRedoService;
+        this._modelRef = this._register(( new MutableDisposable()));
         this._register(
             this.filesConfigurationService.onDidChangeReadonly(() => this._onDidChangeCapabilities.fire())
         );
     }
-    dispose() {
-        this.original.dispose();
-        this.modified.dispose();
-        super.dispose();
-    }
     get typeId() {
         return CustomEditorDiffInput_1.typeId;
     }
@@ -104,7 +92,12 @@ let CustomEditorDiffInput = class CustomEditorDiffInput extends LazilyResolvedWe
         return this.init.modifiedResource;
     }
     getName() {
-        return this.init.label ?? ( localize(8480, "{0} - {1}", this.original.getName(), this.modified.getName()));
+        return this.init.label ?? ( localize(
+            8564,
+            "{0} - {1}",
+            basename(this.originalResource),
+            basename(this.modifiedResource)
+        ));
     }
     getDescription(_verbosity) {
         return this.init.description ?? super.getDescription();
@@ -112,18 +105,19 @@ let CustomEditorDiffInput = class CustomEditorDiffInput extends LazilyResolvedWe
     getTitle(verbosity) {
         const description = this.getDescription(verbosity);
         if (description) {
-            return localize(8481, "{0} ({1})", this.getName(), description);
+            return localize(8565, "{0} ({1})", this.getName(), description);
         }
         return this.getName();
     }
     isReadonly() {
-        if (!this._modelRef) {
+        const modelRef = this._modelRef.value;
+        if (!modelRef) {
             return this.filesConfigurationService.isReadonly(this.modifiedResource);
         }
-        return this._modelRef.object.isReadonly();
+        return modelRef.object.isReadonly();
     }
     isDirty() {
-        return this._modelRef?.object.isDirty() ?? false;
+        return this._modelRef.value?.object.isDirty() ?? false;
     }
     matches(otherInput) {
         if (this === otherInput) {
@@ -145,10 +139,11 @@ let CustomEditorDiffInput = class CustomEditorDiffInput extends LazilyResolvedWe
         return CustomEditorDiffInput_1.create(this.instantiationService, this.init, undefined);
     }
     async save(groupId, options) {
-        if (!this._modelRef) {
+        const modelRef = this._modelRef.value;
+        if (!modelRef) {
             return undefined;
         }
-        const target = await this._modelRef.object.saveCustomEditor(options);
+        const target = await modelRef.object.saveCustomEditor(options);
         if (!target) {
             return undefined;
         }
@@ -158,36 +153,42 @@ let CustomEditorDiffInput = class CustomEditorDiffInput extends LazilyResolvedWe
         return this;
     }
     async saveAs(groupId, options) {
-        if (!this._modelRef) {
+        const modelRef = this._modelRef.value;
+        if (!modelRef) {
             return undefined;
         }
         const target = await this.fileDialogService.pickFileToSave(this.modifiedResource, options?.availableFileSystems);
         if (!target) {
             return undefined;
         }
-        if (!(await this._modelRef.object.saveCustomEditorAs(this.modifiedResource, target, options))) {
+        if (!(await modelRef.object.saveCustomEditorAs(this.modifiedResource, target, options))) {
             return undefined;
         }
         return this.toUntypedWithModifiedResource(target);
     }
     async revert(group, options) {
-        await this._modelRef?.object.revert(options);
+        await this._modelRef.value?.object.revert(options);
     }
     async resolve() {
         await super.resolve();
         if (this.isDisposed()) {
             return null;
         }
-        if (!this._modelRef) {
+        if (!this._modelRef.value) {
             const modelRef = this.customEditorService.models.tryRetain(this.modifiedResource, this.viewType);
             if (modelRef) {
                 const oldCapabilities = this.capabilities;
-                this._modelRef = this._register(await modelRef);
+                const retainedModelRef = await modelRef;
+                if (this.isDisposed()) {
+                    retainedModelRef.dispose();
+                    return null;
+                }
+                this._modelRef.value = retainedModelRef;
                 this._register(
-                    this._modelRef.object.onDidChangeDirty(() => this._onDidChangeDirty.fire())
+                    retainedModelRef.object.onDidChangeDirty(() => this._onDidChangeDirty.fire())
                 );
                 this._register(
-                    this._modelRef.object.onDidChangeReadonly(() => this._onDidChangeCapabilities.fire())
+                    retainedModelRef.object.onDidChangeReadonly(() => this._onDidChangeCapabilities.fire())
                 );
                 if (this.isDirty()) {
                     this._onDidChangeDirty.fire();
@@ -224,25 +225,21 @@ let CustomEditorDiffInput = class CustomEditorDiffInput extends LazilyResolvedWe
         };
     }
 };
-CustomEditorDiffInput = CustomEditorDiffInput_1 = ( __decorate([( __param(4, IThemeService)), ( __param(5, IWebviewWorkbenchService)), ( __param(6, IInstantiationService)), ( __param(7, ICustomEditorService)), ( __param(8, IFilesConfigurationService)), ( __param(9, IFileDialogService)), ( __param(10, IUndoRedoService))], CustomEditorDiffInput));
+CustomEditorDiffInput = CustomEditorDiffInput_1 = ( __decorate([( __param(2, IThemeService)), ( __param(3, IWebviewWorkbenchService)), ( __param(4, IInstantiationService)), ( __param(5, ICustomEditorService)), ( __param(6, IFilesConfigurationService)), ( __param(7, IFileDialogService)), ( __param(8, IUndoRedoService))], CustomEditorDiffInput));
 let CustomEditorSideBySideDiffInput = class CustomEditorSideBySideDiffInput extends LazilyResolvedWebviewEditorInput {
     static {
         CustomEditorSideBySideDiffInput_1 = this;
     }
     static create(instantiationService, init, group) {
         return instantiationService.invokeFunction(accessor => {
-            const textEditorService = accessor.get(ITextEditorService);
-            const sideInput = textEditorService.createTextEditor({
-                resource: init.side === "original" ? init.originalResource : init.modifiedResource
-            });
             const webview = accessor.get(IWebviewService).createWebviewOverlay({
                 providedViewType: init.viewType,
-                title: sideInput.getName(),
+                title: basename(getCustomEditorSideBySideDiffInputResource(init)),
                 options: {},
                 contentOptions: {},
                 extension: undefined
             });
-            const input = instantiationService.createInstance(CustomEditorSideBySideDiffInput_1, init, sideInput, webview);
+            const input = instantiationService.createInstance(CustomEditorSideBySideDiffInput_1, init, webview);
             if (group) {
                 input.updateGroup(group.id);
             }
@@ -254,7 +251,6 @@ let CustomEditorSideBySideDiffInput = class CustomEditorSideBySideDiffInput exte
     }
     constructor(
         init,
-        sideInput,
         webview,
         themeService,
         webviewWorkbenchService,
@@ -267,24 +263,20 @@ let CustomEditorSideBySideDiffInput = class CustomEditorSideBySideDiffInput exte
         super({
             providedId: init.viewType,
             viewType: init.viewType,
-            name: sideInput.getName(),
+            name: basename(getCustomEditorSideBySideDiffInputResource(init)),
             iconPath: init.iconPath
         }, webview, themeService, webviewWorkbenchService);
         this.init = init;
-        this.sideInput = sideInput;
         this.instantiationService = instantiationService;
         this.customEditorService = customEditorService;
         this.filesConfigurationService = filesConfigurationService;
         this.fileDialogService = fileDialogService;
         this.undoRedoService = undoRedoService;
+        this._modelRef = this._register(( new MutableDisposable()));
         this._register(
             this.filesConfigurationService.onDidChangeReadonly(() => this._onDidChangeCapabilities.fire())
         );
     }
-    dispose() {
-        this.sideInput.dispose();
-        super.dispose();
-    }
     get typeId() {
         return CustomEditorSideBySideDiffInput_1.typeId;
     }
@@ -314,25 +306,30 @@ let CustomEditorSideBySideDiffInput = class CustomEditorSideBySideDiffInput exte
         return this.init.diffId;
     }
     getName() {
-        return this.sideInput.getName();
+        return basename(this.resource);
     }
-    getDescription(verbosity) {
-        return this.sideInput.getDescription(verbosity);
+    getDescription(_verbosity) {
+        return this.init.description ?? super.getDescription();
     }
     getTitle(verbosity) {
-        return this.sideInput.getTitle(verbosity);
+        const description = this.getDescription(verbosity);
+        if (description) {
+            return localize(8566, "{0} ({1})", this.getName(), description);
+        }
+        return this.getName();
     }
     isReadonly() {
         if (this.side === "original") {
             return true;
         }
-        if (!this._modelRef) {
+        const modelRef = this._modelRef.value;
+        if (!modelRef) {
             return this.filesConfigurationService.isReadonly(this.modifiedResource);
         }
-        return this._modelRef.object.isReadonly();
+        return modelRef.object.isReadonly();
     }
     isDirty() {
-        return this.side === "modified" ? this._modelRef?.object.isDirty() ?? false : false;
+        return this.side === "modified" ? this._modelRef.value?.object.isDirty() ?? false : false;
     }
     matches(otherInput) {
         if (this === otherInput) {
@@ -353,10 +350,11 @@ let CustomEditorSideBySideDiffInput = class CustomEditorSideBySideDiffInput exte
         return CustomEditorSideBySideDiffInput_1.create(this.instantiationService, this.init, undefined);
     }
     async save(groupId, options) {
-        if (!this._modelRef) {
+        const modelRef = this._modelRef.value;
+        if (!modelRef) {
             return undefined;
         }
-        const target = await this._modelRef.object.saveCustomEditor(options);
+        const target = await modelRef.object.saveCustomEditor(options);
         if (!target) {
             return undefined;
         }
@@ -368,14 +366,15 @@ let CustomEditorSideBySideDiffInput = class CustomEditorSideBySideDiffInput exte
         return this;
     }
     async saveAs(groupId, options) {
-        if (!this._modelRef) {
+        const modelRef = this._modelRef.value;
+        if (!modelRef) {
             return undefined;
         }
         const target = await this.fileDialogService.pickFileToSave(this.modifiedResource, options?.availableFileSystems);
         if (!target) {
             return undefined;
         }
-        if (!(await this._modelRef.object.saveCustomEditorAs(this.modifiedResource, target, options))) {
+        if (!(await modelRef.object.saveCustomEditorAs(this.modifiedResource, target, options))) {
             return undefined;
         }
         return {
@@ -383,23 +382,28 @@ let CustomEditorSideBySideDiffInput = class CustomEditorSideBySideDiffInput exte
         };
     }
     async revert(group, options) {
-        await this._modelRef?.object.revert(options);
+        await this._modelRef.value?.object.revert(options);
     }
     async resolve() {
         await super.resolve();
         if (this.isDisposed()) {
             return null;
         }
-        if (this.side === "modified" && !this._modelRef) {
+        if (this.side === "modified" && !this._modelRef.value) {
             const modelRef = this.customEditorService.models.tryRetain(this.modifiedResource, this.viewType);
             if (modelRef) {
                 const oldCapabilities = this.capabilities;
-                this._modelRef = this._register(await modelRef);
+                const retainedModelRef = await modelRef;
+                if (this.isDisposed()) {
+                    retainedModelRef.dispose();
+                    return null;
+                }
+                this._modelRef.value = retainedModelRef;
                 this._register(
-                    this._modelRef.object.onDidChangeDirty(() => this._onDidChangeDirty.fire())
+                    retainedModelRef.object.onDidChangeDirty(() => this._onDidChangeDirty.fire())
                 );
                 this._register(
-                    this._modelRef.object.onDidChangeReadonly(() => this._onDidChangeCapabilities.fire())
+                    retainedModelRef.object.onDidChangeReadonly(() => this._onDidChangeCapabilities.fire())
                 );
                 if (this.isDirty()) {
                     this._onDidChangeDirty.fire();
@@ -423,6 +427,6 @@ let CustomEditorSideBySideDiffInput = class CustomEditorSideBySideDiffInput exte
         };
     }
 };
-CustomEditorSideBySideDiffInput = CustomEditorSideBySideDiffInput_1 = ( __decorate([( __param(3, IThemeService)), ( __param(4, IWebviewWorkbenchService)), ( __param(5, IInstantiationService)), ( __param(6, ICustomEditorService)), ( __param(7, IFilesConfigurationService)), ( __param(8, IFileDialogService)), ( __param(9, IUndoRedoService))], CustomEditorSideBySideDiffInput));
+CustomEditorSideBySideDiffInput = CustomEditorSideBySideDiffInput_1 = ( __decorate([( __param(2, IThemeService)), ( __param(3, IWebviewWorkbenchService)), ( __param(4, IInstantiationService)), ( __param(5, ICustomEditorService)), ( __param(6, IFilesConfigurationService)), ( __param(7, IFileDialogService)), ( __param(8, IUndoRedoService))], CustomEditorSideBySideDiffInput));
 
 export { CustomEditorDiffInput, CustomEditorSideBySideDiffInput };

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInput.js

@@ -355,11 +355,11 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
     claim(claimant, targetWindow, scopedContextKeyService) {
         if (this.doCanMove(targetWindow.vscodeWindowId) !== true) {
             throw createEditorOpenError(( localize(
-                8482,
+                8567,
                 "Unable to open the editor in this window, it contains modifications that can only be saved in the original window."
             )), [toAction({
                 id: "openInOriginalWindow",
-                label: ( localize(8483, "Open in Original Window")),
+                label: ( localize(8568, "Open in Original Window")),
                 run: async () => {
                     const originalPart = this.editorGroupsService.getPart(this.layoutService.getContainer(getWindow(this.webview.container).window));
                     const currentPart = this.editorGroupsService.getPart(this.layoutService.getContainer(targetWindow.window));
@@ -386,7 +386,7 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
             const sourceWindowId = getWindow(this.webview.container).vscodeWindowId;
             if (sourceWindowId !== targetWindowId) {
                 return localize(
-                    8484,
+                    8569,
                     "Unable to move '{0}': The editor contains changes that can only be saved in its current window.",
                     this.getName()
                 );

package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js

@@ -94,7 +94,7 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
         const lazyButton = append(expression, $("span.lazy-button"));
         lazyButton.classList.add(...ThemeIcon.asClassNameArray(Codicon.eye));
         templateDisposable.add(
-            this.hoverService.setupManagedHover(getDefaultHoverDelegate("mouse"), lazyButton, ( localize(8506, "Click to expand")))
+            this.hoverService.setupManagedHover(getDefaultHoverDelegate("mouse"), lazyButton, ( localize(8588, "Click to expand")))
         );
         const type = append(expression, $("span.type"));
         const value = append(expression, $("span.value"));