Create snapshot on execution

Author: rebornix

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

@@ -503,9 +503,9 @@ export class InteractiveEditorController implements IEditorContribution {
 		}
 	}
 
-	acceptLast(): void {
+	createSnapshot(): void {
 		if (this._activeSession?.lastExchange?.response instanceof EditResponse && this._strategy) {
-			this._activeSession.lastExchange.accepted = true;
+			this._activeSession.createSnapshot();
 		}
 	}
 

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

@@ -8,7 +8,7 @@ import { URI } from 'vs/base/common/uri';
 import { Event } from 'vs/base/common/event';
 import { ResourceEdit, ResourceFileEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
 import { TextEdit } from 'vs/editor/common/languages';
-import { ITextModel } from 'vs/editor/common/model';
+import { ITextModel, ITextSnapshot } from 'vs/editor/common/model';
 import { EditMode, IInteractiveEditorSessionProvider, IInteractiveEditorSession, IInteractiveEditorBulkEditResponse, IInteractiveEditorEditResponse, IInteractiveEditorMessageResponse, IInteractiveEditorResponse, IInteractiveEditorService } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor';
 import { IRange, Range } from 'vs/editor/common/core/range';
 import { IActiveCodeEditor, ICodeEditor } from 'vs/editor/browser/editorBrowser';
@@ -56,6 +56,7 @@ type TelemetryDataClassification = {
 export class Session {
 
 	private _lastInput: string | undefined;
+	private _lastSnapshot: ITextSnapshot | undefined;
 	private readonly _exchange: SessionExchange[] = [];
 	private readonly _startTime = new Date();
 	private readonly _teldata: Partial<TelemetryData>;
@@ -87,20 +88,24 @@ export class Session {
 		return this._lastInput;
 	}
 
+	get lastSnapshot(): ITextSnapshot | undefined {
+		return this._lastSnapshot;
+	}
+
 	get wholeRange(): Range {
 		return this.textModelN.getDecorationRange(this._wholeRangeMarkerId)!;
 		// return new Range(1, 1, 1, 1);
 	}
 
+	createSnapshot(): void {
+		this._lastSnapshot = this.textModelN.createSnapshot();
+	}
+
 	addExchange(exchange: SessionExchange): void {
 		const newLen = this._exchange.push(exchange);
 		this._teldata.rounds += `${newLen}|`;
 	}
 
-	get exchanges(): SessionExchange[] {
-		return this._exchange;
-	}
-
 	get lastExchange(): SessionExchange | undefined {
 		return this._exchange[this._exchange.length - 1];
 	}
@@ -134,16 +139,6 @@ export class Session {
 
 
 export class SessionExchange {
-	private _accepted = false;
-
-	get accepted() {
-		return this._accepted;
-	}
-
-	set accepted(value: boolean) {
-		this._accepted = value;
-	}
-
 	constructor(
 		readonly prompt: string,
 		readonly response: MarkdownResponse | EditResponse | EmptyResponse | ErrorResponse

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

@@ -15,7 +15,9 @@ 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';
@@ -206,7 +208,8 @@ export class LiveStrategy extends EditModeStrategy {
 		@IContextKeyService contextKeyService: IContextKeyService,
 		@IStorageService protected _storageService: IStorageService,
 		@IBulkEditService protected readonly _bulkEditService: IBulkEditService,
-		@IEditorWorkerService protected readonly _editorWorkerService: IEditorWorkerService
+		@IEditorWorkerService protected readonly _editorWorkerService: IEditorWorkerService,
+		@IModelService private readonly _modelService: IModelService
 	) {
 		super();
 		this._inlineDiffDecorations = new InlineDiffDecorations(this._editor, this._inlineDiffEnabled);
@@ -257,11 +260,13 @@ export class LiveStrategy extends EditModeStrategy {
 	}
 
 	async cancel() {
-		const { textModelN: modelN, textModel0: model0 } = this._session;
-		if (modelN.isDisposed() || model0.isDisposed()) {
+		const { textModelN: modelN, textModel0: model0, lastSnapshot } = this._session;
+		if (modelN.isDisposed() || (model0.isDisposed() && !lastSnapshot)) {
 			return;
 		}
-		const edits = await this._editorWorkerService.computeMoreMinimalEdits(modelN.uri, [{ range: modelN.getFullModelRange(), text: model0.getValue() }]);
+
+		const initialTextModel = lastSnapshot ? this._modelService.createModel(createTextBufferFactoryFromSnapshot(lastSnapshot), null) : model0;
+		const edits = await this._editorWorkerService.computeMoreMinimalEdits(modelN.uri, [{ range: modelN.getFullModelRange(), text: initialTextModel.getValue() }]);
 		if (edits) {
 			const operations = edits.map(e => EditOperation.replace(Range.lift(e.range), e.text));
 			modelN.pushEditOperations(null, operations, () => null);
@@ -326,8 +331,9 @@ 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);
+		super(session, editor, widget, contextKeyService, storageService, bulkEditService, editorWorkerService, modelService);
 
 		this._diffZone = instaService.createInstance(InteractiveEditorLivePreviewWidget, editor, session.textModel0);
 		this._previewZone = instaService.createInstance(InteractiveEditorFileCreatePreviewWidget, editor);

src/vs/workbench/contrib/notebook/browser/controller/executeActions.ts

@@ -230,7 +230,7 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
 			return;
 		}
 
-		controller.acceptLast();
+		controller.createSnapshot();
 	}
 });