@codingame/monaco-vscode-api 7.0.11 → 7.1.1

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js

@@ -13,7 +13,7 @@ import { basename, isEqual } from '../../../../base/common/resources.js';
 import Severity$1 from '../../../../base/common/severity.js';
 import { IModelService } from '../../../../editor/common/services/model.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ConfirmResult } from '../../../../platform/dialogs/common/dialogs.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
@@ -28,7 +28,6 @@ import { StorageCloseWithConflicts } from '../common/mergeEditor.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
 var WorkspaceMergeEditorModeFactory_1;
-const _moduleId = "vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel";
 let TempFileMergeEditorModeFactory = class TempFileMergeEditorModeFactory {
     constructor(_mergeEditorTelemetry, _instantiationService, _textModelService, _modelService) {
         this._mergeEditorTelemetry = _mergeEditorTelemetry;
@@ -108,15 +107,13 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         if (someDirty) {
             const isMany = inputModels.length > 1;
             const message = isMany
-                ? ( localizeWithPath(
-                _moduleId,
-                0,
+                ? ( localize(
+                10622,
                 'Do you want keep the merge result of {0} files?',
                 inputModels.length
             ))
-                : ( localizeWithPath(
-                _moduleId,
-                1,
+                : ( localize(
+                10623,
                 'Do you want keep the merge result of {0}?',
                 basename(inputModels[0].model.resultTextModel.uri)
             ));
@@ -124,12 +121,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const buttons = [
                 {
                     label: hasUnhandledConflicts ?
-                        ( localizeWithPath(_moduleId, 2, "&&Save With Conflicts")) :
-                        ( localizeWithPath(_moduleId, 3, "&&Save")),
+                        ( localize(10624, "&&Save With Conflicts")) :
+                        ( localize(10625, "&&Save")),
                     run: () => ConfirmResult.SAVE
                 },
                 {
-                    label: ( localizeWithPath(_moduleId, 4, "Do&&n't Save")),
+                    label: ( localize(10626, "Do&&n't Save")),
                     run: () => ConfirmResult.DONT_SAVE
                 }
             ];
@@ -138,19 +135,17 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
                 message,
                 detail: hasUnhandledConflicts
                     ? isMany
-                        ? ( localizeWithPath(
-                    _moduleId,
-                    5,
+                        ? ( localize(
+                    10627,
                     "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
                 ))
-                        : ( localizeWithPath(
-                    _moduleId,
-                    6,
+                        : ( localize(
+                    10628,
                     "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
                 ))
                     : isMany
-                        ? ( localizeWithPath(_moduleId, 7, "The merge results will be lost if you don't save them."))
-                        : ( localizeWithPath(_moduleId, 8, "The merge result will be lost if you don't save it.")),
+                        ? ( localize(10629, "The merge results will be lost if you don't save them."))
+                        : ( localize(10630, "The merge result will be lost if you don't save it.")),
                 buttons,
                 cancelButton: {
                     run: () => ConfirmResult.CANCEL
@@ -175,13 +170,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         }
         (async () => {
             const { confirmed } = await this.dialogService.confirm({
-                message: ( localizeWithPath(_moduleId, 9, "Do you want to accept the merge result?")),
-                detail: ( localizeWithPath(
-                    _moduleId,
-                    10,
+                message: ( localize(10631, "Do you want to accept the merge result?")),
+                detail: ( localize(
+                    10632,
                     "This will write the merge result to the original file and close the merge editor."
                 )),
-                primaryButton: ( localizeWithPath(_moduleId, 11, '&&Accept Merge'))
+                primaryButton: ( localize(10633, '&&Accept Merge'))
             });
             if (confirmed) {
                 await this.accept();
@@ -206,7 +200,7 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         this._textModelService = _textModelService;
         this.textFileService = textFileService;
     }
-    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localizeWithPath(_moduleId, 12, "Before Resolving Conflicts In Merge Editor"))); }
+    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(10634, "Before Resolving Conflicts In Merge Editor"))); }
     async createInputModel(args) {
         const store = ( (new DisposableStore()));
         let resultTextFileModel = undefined;
@@ -315,15 +309,13 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         const someUnhandledConflicts = ( (inputModels.some(m => m.model.hasUnhandledConflicts.get())));
         if (someDirty) {
             const message = isMany
-                ? ( localizeWithPath(
-                _moduleId,
-                13,
+                ? ( localize(
+                10635,
                 'Do you want to save the changes you made to {0} files?',
                 inputModels.length
             ))
-                : ( localizeWithPath(
-                _moduleId,
-                14,
+                : ( localize(
+                10636,
                 'Do you want to save the changes you made to {0}?',
                 basename(inputModels[0].resultUri)
             ));
@@ -332,28 +324,26 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 message,
                 detail: someUnhandledConflicts ?
                     isMany
-                        ? ( localizeWithPath(
-                        _moduleId,
-                        15,
+                        ? ( localize(
+                        10637,
                         "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
-                        : ( localizeWithPath(
-                        _moduleId,
-                        16,
+                        : ( localize(
+                        10638,
                         "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                     : isMany
-                        ? ( localizeWithPath(_moduleId, 17, "Your changes will be lost if you don't save them."))
-                        : ( localizeWithPath(_moduleId, 18, "Your changes will be lost if you don't save them.")),
+                        ? ( localize(10639, "Your changes will be lost if you don't save them."))
+                        : ( localize(10640, "Your changes will be lost if you don't save them.")),
                 buttons: [
                     {
                         label: someUnhandledConflicts
-                            ? ( localizeWithPath(_moduleId, 19, '&&Save with Conflicts'))
-                            : ( localizeWithPath(_moduleId, 20, '&&Save')),
+                            ? ( localize(10641, '&&Save with Conflicts'))
+                            : ( localize(10642, '&&Save')),
                         run: () => ConfirmResult.SAVE
                     },
                     {
-                        label: ( localizeWithPath(_moduleId, 21, "Do&&n't Save")),
+                        label: ( localize(10643, "Do&&n't Save")),
                         run: () => ConfirmResult.DONT_SAVE
                     }
                 ],
@@ -366,27 +356,21 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         else if (someUnhandledConflicts && !this._storageService.getBoolean(StorageCloseWithConflicts, StorageScope.PROFILE, false)) {
             const { confirmed, checkboxChecked } = await this._dialogService.confirm({
                 message: isMany
-                    ? ( localizeWithPath(
-                    _moduleId,
-                    22,
-                    'Do you want to close {0} merge editors?',
-                    inputModels.length
-                ))
-                    : ( localizeWithPath(
-                    _moduleId,
-                    23,
+                    ? ( localize(10644, 'Do you want to close {0} merge editors?', inputModels.length))
+                    : ( localize(
+                    10645,
                     'Do you want to close the merge editor for {0}?',
                     basename(inputModels[0].resultUri)
                 )),
                 detail: someUnhandledConflicts ?
                     isMany
-                        ? ( localizeWithPath(_moduleId, 24, "The files contain unhandled conflicts."))
-                        : ( localizeWithPath(_moduleId, 25, "The file contains unhandled conflicts."))
+                        ? ( localize(10646, "The files contain unhandled conflicts."))
+                        : ( localize(10647, "The file contains unhandled conflicts."))
                     : undefined,
                 primaryButton: someUnhandledConflicts
-                    ? ( localizeWithPath(_moduleId, 26, '&&Close with Conflicts'))
-                    : ( localizeWithPath(_moduleId, 27, '&&Close')),
-                checkbox: { label: ( localizeWithPath(_moduleId, 28, "Do not ask me again")) }
+                    ? ( localize(10648, '&&Close with Conflicts'))
+                    : ( localize(10649, '&&Close')),
+                checkbox: { label: ( localize(10650, "Do not ask me again")) }
             });
             if (checkboxChecked) {
                 this._storageService.store(StorageCloseWithConflicts, true, StorageScope.PROFILE, StorageTarget.USER);

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js

@@ -8,7 +8,7 @@ import { keepObserved } from '../../../../../base/common/observableInternal/util
 import { waitForState } from '../../../../../base/common/observableInternal/promise.js';
 import { Range } from '../../../../../editor/common/core/range.js';
 import { ILanguageService } from '../../../../../editor/common/languages/language.js';
-import { localizeWithPath } from '../../../../../nls.js';
+import { localize } from '../../../../../nls.js';
 import { UndoRedoElementType, UndoRedoGroup } from '../../../../../platform/undoRedo/common/undoRedo.js';
 import { IUndoRedoService } from '../../../../../platform/undoRedo/common/undoRedo.service.js';
 import { EditorModel } from '../../../../common/editor/editorModel.js';
@@ -17,7 +17,6 @@ import { DocumentLineRangeMap, LineRangeMapping, DocumentRangeMap } from './mapp
 import { TextModelDiffs, TextModelDiffState, TextModelDiffChangeReason } from './textModelDiffs.js';
 import { leftJoin } from '../utils.js';
 import { ModifiedBaseRange, ModifiedBaseRangeStateKind, ModifiedBaseRangeState } from './modifiedBaseRange.js';
-const _moduleId = "vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel";
 let MergeEditorModel = class MergeEditorModel extends EditorModel {
     constructor(base, input1, input2, resultTextModel, diffComputer, options, telemetry, languageService, undoRedoService) {
         super();
@@ -386,7 +385,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
             type: UndoRedoElementType.Resource,
             resource: this.resultTextModel.uri,
             code: 'setInputHandled',
-            label: ( localizeWithPath(_moduleId, 0, "Set Input Handled")),
+            label: ( localize(11380, "Set Input Handled")),
             redo() {
                 const model = modelRef.deref();
                 const data = dataRef.deref();
@@ -601,7 +600,7 @@ class MarkAsHandledUndoRedoElement {
         this.input1Handled = input1Handled;
         this.input2Handled = input2Handled;
         this.code = 'undoMarkAsHandled';
-        this.label = ( localizeWithPath(_moduleId, 1, 'Undo Mark As Handled'));
+        this.label = ( localize(11381, 'Undo Mark As Handled'));
         this.type = UndoRedoElementType.Resource;
     }
     redo() {

package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js

@@ -1,33 +1,32 @@
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-const _moduleId = "vs/workbench/contrib/mergeEditor/common/mergeEditor";
-const ctxIsMergeEditor = ( (new RawContextKey('isMergeEditor', false, { type: 'boolean', description: ( localizeWithPath(_moduleId, 0, 'The editor is a merge editor')) })));
+const ctxIsMergeEditor = ( (new RawContextKey('isMergeEditor', false, { type: 'boolean', description: ( localize(10824, 'The editor is a merge editor')) })));
 const ctxIsMergeResultEditor = ( (new RawContextKey(
  'isMergeResultEditor',
  false,
- { type: 'boolean', description: ( localizeWithPath(_moduleId, 1, 'The editor is a the result editor of a merge editor.')) }
+ { type: 'boolean', description: ( localize(10825, 'The editor is a the result editor of a merge editor.')) }
 )));
 const ctxMergeEditorLayout = ( (new RawContextKey(
  'mergeEditorLayout',
  'mixed',
- { type: 'string', description: ( localizeWithPath(_moduleId, 2, 'The layout mode of a merge editor')) }
+ { type: 'string', description: ( localize(10826, 'The layout mode of a merge editor')) }
 )));
 const ctxMergeEditorShowBase = ( (new RawContextKey(
  'mergeEditorShowBase',
  false,
- { type: 'boolean', description: ( localizeWithPath(_moduleId, 3, 'If the merge editor shows the base version')) }
+ { type: 'boolean', description: ( localize(10827, 'If the merge editor shows the base version')) }
 )));
 const ctxMergeEditorShowBaseAtTop = ( (new RawContextKey(
  'mergeEditorShowBaseAtTop',
  false,
- { type: 'boolean', description: ( localizeWithPath(_moduleId, 4, 'If base should be shown at the top')) }
+ { type: 'boolean', description: ( localize(10828, 'If base should be shown at the top')) }
 )));
 const ctxMergeEditorShowNonConflictingChanges = ( (new RawContextKey(
  'mergeEditorShowNonConflictingChanges',
  false,
- { type: 'boolean', description: ( localizeWithPath(_moduleId, 5, 'If the merge editor shows non-conflicting changes')) }
+ { type: 'boolean', description: ( localize(10829, 'If the merge editor shows non-conflicting changes')) }
 )));
-const ctxMergeBaseUri = ( (new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localizeWithPath(_moduleId, 6, 'The uri of the baser of a merge editor')) })));
-const ctxMergeResultUri = ( (new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localizeWithPath(_moduleId, 7, 'The uri of the result of a merge editor')) })));
+const ctxMergeBaseUri = ( (new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localize(10830, 'The uri of the baser of a merge editor')) })));
+const ctxMergeResultUri = ( (new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localize(10831, 'The uri of the result of a merge editor')) })));
 const StorageCloseWithConflicts = 'mergeEditorCloseWithConflicts';
 export { StorageCloseWithConflicts, ctxIsMergeEditor, ctxIsMergeResultEditor, ctxMergeBaseUri, ctxMergeEditorLayout, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, ctxMergeEditorShowNonConflictingChanges, ctxMergeResultUri };

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js

@@ -1,6 +1,5 @@
 import { Codicon } from '../../../../base/common/codicons.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-const _moduleId = "vs/workbench/contrib/multiDiffEditor/browser/icons.contribution";
-const MultiDiffEditorIcon = registerIcon('multi-diff-editor-label-icon', Codicon.diffMultiple, ( localizeWithPath(_moduleId, 0, 'Icon of the multi diff editor label.')));
+const MultiDiffEditorIcon = registerIcon('multi-diff-editor-label-icon', Codicon.diffMultiple, ( localize(10159, 'Icon of the multi diff editor label.')));
 export { MultiDiffEditorIcon };

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { LazyStatefulPromise, raceTimeout } from '../../../../base/common/async.js';
 import { BugIndicatingError, onUnexpectedError } from '../../../../base/common/errors.js';
 import { ValueWithChangeEvent, Event } from '../../../../base/common/event.js';
-import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { parse } from '../../../../base/common/marshalling.js';
 import { Schemas } from '../../../../base/common/network.js';
 import { deepClone } from '../../../../base/common/objects.js';
@@ -14,11 +14,11 @@ import { ObservableLazyPromise } from '../../../../base/common/observableInterna
 import '../../../../base/common/arrays.js';
 import { isDefined, isObject } from '../../../../base/common/types.js';
 import { URI } from '../../../../base/common/uri.js';
-import { ConstLazyPromise } from '../../../../editor/browser/widget/multiDiffEditor/model.js';
+import { RefCounted } from '../../../../editor/browser/widget/diffEditor/utils.js';
 import { MultiDiffEditorViewModel } from '../../../../editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { ConfirmResult } from '../../../../platform/dialogs/common/dialogs.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { EditorInputCapabilities, DEFAULT_EDITOR_ASSOCIATION } from '../../../common/editor.js';
@@ -30,7 +30,6 @@ import { RegisteredEditorPriority } from '../../../services/editor/common/editor
 import { IEditorResolverService } from '../../../services/editor/common/editorResolverService.service.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
 var MultiDiffEditorInput_1;
-const _moduleId = "vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput";
 let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
     static { MultiDiffEditorInput_1 = this; }
     static fromResourceMultiDiffEditorInput(input, instantiationService) {
@@ -42,14 +41,19 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         )));
         return instantiationService.createInstance(MultiDiffEditorInput_1, multiDiffSource, input.label, input.resources?.map(resource => {
             return (
-                 (new MultiDiffEditorItem(resource.original.resource, resource.modified.resource))
+                 (new MultiDiffEditorItem(
+                    resource.original.resource,
+                    resource.modified.resource,
+                    resource.goToFileResource
+                ))
             );
         }), input.isTransient ?? false);
     }
     static fromSerialized(data, instantiationService) {
         return instantiationService.createInstance(MultiDiffEditorInput_1, ( (URI.parse(data.multiDiffSourceUri))), data.label, data.resources?.map(resource => ( (new MultiDiffEditorItem(
             resource.originalUri ? ( (URI.parse(resource.originalUri))) : undefined,
-            resource.modifiedUri ? ( (URI.parse(resource.modifiedUri))) : undefined
+            resource.modifiedUri ? ( (URI.parse(resource.modifiedUri))) : undefined,
+            resource.goToFileUri ? ( (URI.parse(resource.goToFileUri))) : undefined
         )))), false);
     }
     static { this.ID = 'workbench.input.multiDiffEditor'; }
@@ -90,8 +94,8 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         })));
         this.resources = derived(this, reader => this._resolvedSource.cachedPromiseResult.read(reader)?.data?.resources.read(reader));
         this._isDirtyObservables = mapObservableArrayCached(this, ( (this.resources.map(r => r ?? []))), res => {
-            const isModifiedDirty = res.modified ? isUriDirty(this._textFileService, res.modified) : constObservable(false);
-            const isOriginalDirty = res.original ? isUriDirty(this._textFileService, res.original) : constObservable(false);
+            const isModifiedDirty = res.modifiedUri ? isUriDirty(this._textFileService, res.modifiedUri) : constObservable(false);
+            const isOriginalDirty = res.originalUri ? isUriDirty(this._textFileService, res.originalUri) : constObservable(false);
             return derived(reader =>  isModifiedDirty.read(reader) || isOriginalDirty.read(reader));
         }, i => i.getKey());
         this._isDirtyObservable = derived(this, reader => ( (this._isDirtyObservables.read(reader).some(isDirty => isDirty.read(reader)))))
@@ -107,9 +111,9 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         };
         this._register(autorun((reader) => {
             const resources = this.resources.read(reader);
-            const label = this.label ?? ( localizeWithPath(_moduleId, 0, "Multi Diff Editor"));
+            const label = this.label ?? ( localize(5738, "Multi Diff Editor"));
             if (resources) {
-                this._name = label + ( localizeWithPath(_moduleId, 1, " ({0} files)", resources.length));
+                this._name = label + ( localize(5739, " ({0} files)", resources.length));
             }
             else {
                 this._name = label;
@@ -122,14 +126,15 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
             label: this.label,
             multiDiffSourceUri: ( (this.multiDiffSource.toString())),
             resources: this.initialResources?.map(resource => ({
-                originalUri: resource.original?.toString(),
-                modifiedUri: resource.modified?.toString(),
+                originalUri: resource.originalUri?.toString(),
+                modifiedUri: resource.modifiedUri?.toString(),
+                goToFileUri: resource.goToFileUri?.toString(),
             })),
         };
     }
     setLanguageId(languageId, source) {
         const activeDiffItem = this._viewModel.requireValue().activeDiffItem.get();
-        const value = activeDiffItem?.entry?.value;
+        const value = activeDiffItem?.documentDiffItem;
         if (!value) {
             return;
         }
@@ -145,24 +150,20 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
     async _createModel() {
         const source = await this._resolvedSource.getPromise();
         const textResourceConfigurationService = this._textResourceConfigurationService;
-        const garbage = ( (new DisposableStore()));
         const documentsWithPromises = mapObservableArrayCached(this, source.resources, async (r, store) => {
             let original;
             let modified;
-            const store2 = ( (new DisposableStore()));
-            store.add(toDisposable(() => {
-                garbage.add(store2);
-            }));
+            const multiDiffItemStore = ( (new DisposableStore()));
             try {
                 [original, modified] = await Promise.all([
-                    r.original ? this._textModelService.createModelReference(r.original) : undefined,
-                    r.modified ? this._textModelService.createModelReference(r.modified) : undefined,
+                    r.originalUri ? this._textModelService.createModelReference(r.originalUri) : undefined,
+                    r.modifiedUri ? this._textModelService.createModelReference(r.modifiedUri) : undefined,
                 ]);
                 if (original) {
-                    store2.add(original);
+                    multiDiffItemStore.add(original);
                 }
                 if (modified) {
-                    store2.add(modified);
+                    multiDiffItemStore.add(modified);
                 }
             }
             catch (e) {
@@ -170,40 +171,36 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
                 onUnexpectedError(e);
                 return undefined;
             }
-            const uri = (r.modified ?? r.original);
-            return (
-                 (new ConstLazyPromise({
-                    original: original?.object.textEditorModel,
-                    modified: modified?.object.textEditorModel,
-                    get options() {
-                        return {
-                            ...getReadonlyConfiguration(modified?.object.isReadonly() ?? true),
-                            ...computeOptions(textResourceConfigurationService.getValue(uri)),
-                        };
-                    },
-                    onOptionsDidChange: h => this._textResourceConfigurationService.onDidChangeConfiguration(e => {
-                        if (e.affectsConfiguration(uri, 'editor') || e.affectsConfiguration(uri, 'diffEditor')) {
-                            h();
-                        }
-                    }),
-                }))
-            );
-        }, i => JSON.stringify([i.modified?.toString(), i.original?.toString()]));
+            const uri = (r.modifiedUri ?? r.originalUri);
+            const result = {
+                multiDiffEditorItem: r,
+                original: original?.object.textEditorModel,
+                modified: modified?.object.textEditorModel,
+                get options() {
+                    return {
+                        ...getReadonlyConfiguration(modified?.object.isReadonly() ?? true),
+                        ...computeOptions(textResourceConfigurationService.getValue(uri)),
+                    };
+                },
+                onOptionsDidChange: h => this._textResourceConfigurationService.onDidChangeConfiguration(e => {
+                    if (e.affectsConfiguration(uri, 'editor') || e.affectsConfiguration(uri, 'diffEditor')) {
+                        h();
+                    }
+                }),
+            };
+            return store.add(RefCounted.createOfNonDisposable(result, multiDiffItemStore, this));
+        }, i => JSON.stringify([i.modifiedUri?.toString(), i.originalUri?.toString()]));
         const documents = observableValue('documents', []);
         const updateDocuments = derived(async (reader) => {
             const docsPromises = documentsWithPromises.read(reader);
             const docs = await Promise.all(docsPromises);
             const newDocuments = docs.filter(isDefined);
             documents.set(newDocuments, undefined);
-            garbage.clear();
         });
         const a = recomputeInitiallyAndOnChange(updateDocuments);
         await updateDocuments.get();
         const result = {
-            dispose: () => {
-                a.dispose();
-                garbage.dispose();
-            },
+            dispose: () => a.dispose(),
             documents: ( (new ValueWithChangeEventFromObservable(documents))),
             contextKeys: source.source?.contextKeys,
         };

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.js

@@ -1,15 +1,16 @@
 import { BugIndicatingError } from '../../../../base/common/errors.js';
 import { toDisposable } from '../../../../base/common/lifecycle.js';
 class MultiDiffEditorItem {
-    constructor(original, modified) {
-        this.original = original;
-        this.modified = modified;
-        if (!original && !modified) {
+    constructor(originalUri, modifiedUri, goToFileUri) {
+        this.originalUri = originalUri;
+        this.modifiedUri = modifiedUri;
+        this.goToFileUri = goToFileUri;
+        if (!originalUri && !modifiedUri) {
             throw ( new BugIndicatingError('Invalid arguments'));
         }
     }
     getKey() {
-        return JSON.stringify([this.modified?.toString(), this.original?.toString()]);
+        return JSON.stringify([this.modifiedUri?.toString(), this.originalUri?.toString()]);
     }
 }
 class MultiDiffSourceResolverService {

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.js

@@ -6,7 +6,7 @@ import '../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent, ValueWithChangeEventFromObservable } from '../../../../base/common/observableInternal/utils.js';
 import { waitForState } from '../../../../base/common/observableInternal/promise.js';
 import { URI } from '../../../../base/common/uri.js';
-import { localize2WithPath } from '../../../../nls.js';
+import { localize2 } from '../../../../nls.js';
 import { Action2 } from '../../../../platform/actions/common/actions.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { MultiDiffEditorItem } from './multiDiffSourceResolverService.js';
@@ -14,7 +14,6 @@ import { IMultiDiffSourceResolverService } from './multiDiffSourceResolverServic
 import { ISCMService } from '../../scm/common/scm.service.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 var ScmMultiDiffSourceResolver_1;
-const _moduleId = "vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver";
 let ScmMultiDiffSourceResolver = class ScmMultiDiffSourceResolver {
     static { ScmMultiDiffSourceResolver_1 = this; }
     static { this._scheme = 'scm-multi-diff-source'; }
@@ -69,7 +68,7 @@ class ScmResolvedMultiDiffSource {
         this._group = _group;
         this._repository = _repository;
         this._resources = observableFromEvent(this._group.onDidChangeResources, () => (  (this._group.resources.map(
-            e => ( (new MultiDiffEditorItem(e.multiDiffEditorOriginalUri, e.multiDiffEditorModifiedUri)))
+            e => ( (new MultiDiffEditorItem(e.multiDiffEditorOriginalUri, e.multiDiffEditorModifiedUri, e.sourceUri)))
         ))));
         this.resources = ( (new ValueWithChangeEventFromObservable(this._resources)));
         this.contextKeys = {
@@ -100,7 +99,7 @@ class OpenScmGroupAction extends Action2 {
     constructor() {
         super({
             id: '_workbench.openScmMultiDiffEditor',
-            title: ( localize2WithPath(_moduleId, 0, 'View Changes')),
+            title: ( localize2(5743, 'View Changes')),
             f1: false
         });
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from '../../../../../../../../../external/tslib/t
 import { disposableTimeout, RunOnceScheduler } from '../../../../../../base/common/async.js';
 import { Disposable, MutableDisposable, dispose } from '../../../../../../base/common/lifecycle.js';
 import { language } from '../../../../../../base/common/platform.js';
-import { localizeWithPath } from '../../../../../../nls.js';
+import { localize } from '../../../../../../nls.js';
 import { IInstantiationService } from '../../../../../../platform/instantiation/common/instantiation.js';
 import { themeColorFromId } from '../../../../../../platform/theme/common/themeService.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
@@ -15,7 +15,6 @@ import { NotebookExecutionType } from '../../../common/notebookExecutionStateSer
 import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.service.js';
 import { INotebookService } from '../../../common/notebookService.service.js';
 var ExecutionStateCellStatusBarItem_1, TimerCellStatusBarItem_1;
-const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController";
 function formatCellDuration(duration, showMilliseconds = true) {
     if (showMilliseconds && duration < 1000) {
         return `${duration}ms`;
@@ -133,7 +132,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
             return [{
                     text: `$(${successStateIcon.id})`,
                     color: themeColorFromId(cellStatusIconSuccess),
-                    tooltip: ( localizeWithPath(_moduleId, 0, "Success")),
+                    tooltip: ( localize(8004, "Success")),
                     alignment: CellStatusbarAlignment.Left,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
@@ -142,7 +141,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
             return [{
                     text: `$(${errorStateIcon.id})`,
                     color: themeColorFromId(cellStatusIconError),
-                    tooltip: ( localizeWithPath(_moduleId, 1, "Failed")),
+                    tooltip: ( localize(8005, "Failed")),
                     alignment: CellStatusbarAlignment.Left,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
@@ -150,7 +149,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
         else if (state === NotebookCellExecutionState.Pending || state === NotebookCellExecutionState.Unconfirmed) {
             return [{
                     text: `$(${pendingStateIcon.id})`,
-                    tooltip: ( localizeWithPath(_moduleId, 2, "Pending")),
+                    tooltip: ( localize(8006, "Pending")),
                     alignment: CellStatusbarAlignment.Left,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
@@ -161,7 +160,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
                 ThemeIcon.modify(executingStateIcon, 'spin');
             return [{
                     text: `$(${icon.id})`,
-                    tooltip: ( localizeWithPath(_moduleId, 3, "Executing")),
+                    tooltip: ( localize(8007, "Executing")),
                     alignment: CellStatusbarAlignment.Left,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
@@ -265,15 +264,10 @@ let TimerCellStatusBarItem = class TimerCellStatusBarItem extends Disposable {
                 }));
                 renderTimes += `- [${rendererInfo?.displayName ?? key}](command:workbench.action.openIssueReporter?${args}) ${formatCellDuration(renderDuration[key])}\n`;
             }
-            renderTimes += `\n*${( localizeWithPath(
-                _moduleId,
-                4,
-                "Use the links above to file an issue using the issue reporter."
-            ))}*\n`;
+            renderTimes += `\n*${( localize(8008, "Use the links above to file an issue using the issue reporter."))}*\n`;
             tooltip = {
-                value: ( localizeWithPath(
-                    _moduleId,
-                    5,
+                value: ( localize(
+                    8009,
                     "**Last Execution** {0}\n\n**Execution Time** {1}\n\n**Overhead Time** {2}\n\n**Render Times**\n\n{3}",
                     lastExecution,
                     formatCellDuration(executionDuration),