chore - reduce dependency on IModifiedFileEntry#originalModel (#240500)

Author: jrieken

src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorController.ts

@@ -42,6 +42,7 @@ import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../..
 import { TextEditorSelectionRevealType } from '../../../../../platform/editor/common/editor.js';
 import { AccessibleDiffViewer, IAccessibleDiffViewerModel } from '../../../../../editor/browser/widget/diffEditor/components/accessibleDiffViewer.js';
 import { LineRange } from '../../../../../editor/common/core/lineRange.js';
+import { IModelService } from '../../../../../editor/common/services/model.js';
 
 export const ctxIsGlobalEditingSession = new RawContextKey<boolean>('chat.isGlobalEditingSession', undefined, localize('chat.ctxEditSessionIsGlobal', "The current editor is part of the global edit session"));
 export const ctxHasEditorModification = new RawContextKey<boolean>('chat.hasEditorModifications', undefined, localize('chat.hasEditorModifications', "The current editor contains chat modifications"));
@@ -318,7 +319,7 @@ export class ChatEditorController extends Disposable implements IEditorContribut
 				editorObs.layoutInfo.map((v, r) => v.width),
 				editorObs.layoutInfo.map((v, r) => v.height),
 				entry.diffInfo.map(diff => diff.changes.slice()),
-				new AccessibleDiffViewerModel(entry, _editor),
+				_instantiationService.createInstance(AccessibleDiffViewerModel, entry, _editor),
 			));
 		}));
 	}
@@ -883,10 +884,14 @@ class AccessibleDiffViewContainer implements IOverlayWidget {
 }
 
 class AccessibleDiffViewerModel implements IAccessibleDiffViewerModel {
-	constructor(private readonly entry: IModifiedFileEntry, private readonly _editor: ICodeEditor) { }
+	constructor(
+		private readonly entry: IModifiedFileEntry,
+		private readonly _editor: ICodeEditor,
+		@IModelService private readonly _modelService: IModelService,
+	) { }
 
 	getOriginalModel() {
-		return this.entry?.originalModel;
+		return this._modelService.getModel(this.entry.originalURI)!;
 	}
 
 	getOriginalOptions() {

src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingSession.ts

@@ -575,13 +575,6 @@ export class ChatEditingSession extends Disposable implements IChatEditingSessio
 		this._onDidDispose.dispose();
 	}
 
-	getVirtualModel(documentId: string): ITextModel | null {
-		this._assertNotDisposed();
-
-		const entry = this._entriesObs.get().find(e => e.entryId === documentId);
-		return entry?.originalModel ?? null;
-	}
-
 	acceptStreamingEditsStart(): void {
 		if (this._state.get() === ChatEditingSessionState.Disposed) {
 			// we don't throw in this case because there could be a builder still connected to a disposed session

src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingTextModelContentProviders.ts

@@ -38,11 +38,12 @@ export class ChatEditingTextModelContentProvider implements ITextModelContentPro
 
 		const session = this._chatEditingService.getEditingSession(data.chatSessionId);
 
-		if (!(session instanceof ChatEditingSession)) {
+		const entry = session?.entries.get().find(candidate => candidate.entryId === data.documentId);
+		if (!entry) {
 			return null;
 		}
 
-		return session.getVirtualModel(data.documentId);
+		return this._modelService.getModel(entry.originalURI);
 	}
 }