add getValueFromSnapshot util

Author: jrieken

src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorController.ts

@@ -504,7 +504,7 @@ export class InteractiveEditorController implements IEditorContribution {
 	}
 
 	createSnapshot(): void {
-		if (this._activeSession?.lastExchange?.response instanceof EditResponse && this._strategy) {
+		if (this._activeSession && !this._activeSession.textModel0.equalsTextBuffer(this._activeSession.textModelN.getTextBuffer())) {
 			this._activeSession.createSnapshot();
 		}
 	}

src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditorStrategies.ts

@@ -15,16 +15,15 @@ import { Selection } from 'vs/editor/common/core/selection';
 import { LineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
 import { IEditorDecorationsCollection } from 'vs/editor/common/editorCommon';
 import { ICursorStateComputer, IModelDecorationOptions, IModelDeltaDecoration, IValidEditOperation } from 'vs/editor/common/model';
-import { createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
-import { IModelService } from 'vs/editor/common/services/model';
 import { localize } from 'vs/nls';
 import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
 import { InteractiveEditorFileCreatePreviewWidget, InteractiveEditorLivePreviewWidget } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorLivePreviewWidget';
 import { EditResponse, Session } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorSession';
 import { InteractiveEditorWidget } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorWidget';
+import { getValueFromSnapshot } from 'vs/workbench/contrib/interactiveEditor/browser/utils';
 import { CTX_INTERACTIVE_EDITOR_INLNE_DIFF, CTX_INTERACTIVE_EDITOR_DOCUMENT_CHANGED } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor';
 
 export abstract class EditModeStrategy {
@@ -209,7 +208,6 @@ export class LiveStrategy extends EditModeStrategy {
 		@IStorageService protected _storageService: IStorageService,
 		@IBulkEditService protected readonly _bulkEditService: IBulkEditService,
 		@IEditorWorkerService protected readonly _editorWorkerService: IEditorWorkerService,
-		@IModelService private readonly _modelService: IModelService
 	) {
 		super();
 		this._inlineDiffDecorations = new InlineDiffDecorations(this._editor, this._inlineDiffEnabled);
@@ -265,8 +263,11 @@ export class LiveStrategy extends EditModeStrategy {
 			return;
 		}
 
-		const initialTextModel = lastSnapshot ? this._modelService.createModel(createTextBufferFactoryFromSnapshot(lastSnapshot), null) : model0;
-		const edits = await this._editorWorkerService.computeMoreMinimalEdits(modelN.uri, [{ range: modelN.getFullModelRange(), text: initialTextModel.getValue() }]);
+		const newText = lastSnapshot
+			? getValueFromSnapshot(lastSnapshot)
+			: model0.getValue();
+
+		const edits = await this._editorWorkerService.computeMoreMinimalEdits(modelN.uri, [{ range: modelN.getFullModelRange(), text: newText }]);
 		if (edits) {
 			const operations = edits.map(e => EditOperation.replace(Range.lift(e.range), e.text));
 			modelN.pushEditOperations(null, operations, () => null);
@@ -331,9 +332,8 @@ export class LivePreviewStrategy extends LiveStrategy {
 		@IBulkEditService bulkEditService: IBulkEditService,
 		@IEditorWorkerService editorWorkerService: IEditorWorkerService,
 		@IInstantiationService instaService: IInstantiationService,
-		@IModelService modelService: IModelService
 	) {
-		super(session, editor, widget, contextKeyService, storageService, bulkEditService, editorWorkerService, modelService);
+		super(session, editor, widget, contextKeyService, storageService, bulkEditService, editorWorkerService);
 
 		this._diffZone = instaService.createInstance(InteractiveEditorLivePreviewWidget, editor, session.textModel0);
 		this._previewZone = instaService.createInstance(InteractiveEditorFileCreatePreviewWidget, editor);

src/vs/workbench/contrib/interactiveEditor/browser/utils.ts

@@ -5,7 +5,7 @@
 
 import { LineRange } from 'vs/editor/common/core/lineRange';
 import { Range } from 'vs/editor/common/core/range';
-import { ITextModel } from 'vs/editor/common/model';
+import { ITextModel, ITextSnapshot } from 'vs/editor/common/model';
 
 export function invertLineRange(range: LineRange, model: ITextModel): LineRange[] {
 	if (range.isEmpty) {
@@ -20,3 +20,15 @@ export function invertLineRange(range: LineRange, model: ITextModel): LineRange[
 export function lineRangeAsRange(r: LineRange): Range {
 	return new Range(r.startLineNumber, 1, r.endLineNumberExclusive - 1, 1);
 }
+
+export function getValueFromSnapshot(snapshot: ITextSnapshot): string {
+	let result = '';
+	while (true) {
+		const chunk = snapshot.read();
+		if (chunk === null) {
+			break;
+		}
+		result += chunk;
+	}
+	return result;
+}