fix microsoft/vscode-copilot#3134 (microsoft#199523)

Author: jrieken

src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts

@@ -691,6 +691,7 @@ export class InlineChatController implements IEditorContribution {
 			this._zone.value.widget.updateFollowUps(undefined);
 			this._zone.value.widget.updateProgress(true);
 			this._zone.value.widget.updateInfo(!this._activeSession.lastExchange ? localize('thinking', "Thinking\u2026") : '');
+			await this._strategy.start();
 			this._ctxHasActiveRequest.set(true);
 			reply = await raceCancellationError(Promise.resolve(task), requestCts.token);
 

src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts

@@ -59,6 +59,8 @@ export abstract class EditModeStrategy {
 		this._onDidDiscard.dispose();
 	}
 
+	abstract start(): Promise<void>;
+
 	abstract apply(): Promise<void>;
 
 	abstract cancel(): Promise<void>;
@@ -102,6 +104,10 @@ export class PreviewStrategy extends EditModeStrategy {
 		super.dispose();
 	}
 
+	async start() {
+		// nothing to do
+	}
+
 	async apply() {
 
 		if (!(this._session.lastExchange?.response instanceof ReplyResponse)) {
@@ -280,6 +286,10 @@ export class LiveStrategy extends EditModeStrategy {
 		this._inlineDiffDecorations.visible = this._diffEnabled;
 	}
 
+	async start() {
+		// nothing to do
+	}
+
 	async apply() {
 		if (this._editCount > 0) {
 			this._editor.pushUndoStop();
@@ -637,22 +647,27 @@ export class LiveStrategy3 extends EditModeStrategy {
 	}
 
 	override dispose(): void {
-		this._ctxCurrentChangeHasDiff.reset();
-		this._ctxCurrentChangeShowsDiff.reset();
-		this._modifiedRangesDecorations.clear();
+		this._resetDiff();
 		this._previewZone.rawValue?.dispose();
-		this._sessionStore.dispose();
 		this._store.dispose();
 		super.dispose();
 	}
 
-
-	async apply() {
+	private _resetDiff(): void {
 		this._ctxCurrentChangeHasDiff.reset();
 		this._ctxCurrentChangeShowsDiff.reset();
 		this._sessionStore.clear();
 		this._modifiedRangesDecorations.clear();
 		this._modifiedRangesThatHaveBeenInteractedWith.length = 0;
+		this._zone.widget.updateStatus('');
+	}
+
+	async start() {
+		this._resetDiff();
+	}
+
+	async apply() {
+		this._resetDiff();
 		if (this._editCount > 0) {
 			this._editor.pushUndoStop();
 		}
@@ -666,11 +681,7 @@ export class LiveStrategy3 extends EditModeStrategy {
 	}
 
 	async cancel() {
-		this._ctxCurrentChangeHasDiff.reset();
-		this._ctxCurrentChangeShowsDiff.reset();
-		this._sessionStore.clear();
-		this._modifiedRangesDecorations.clear();
-		this._modifiedRangesThatHaveBeenInteractedWith.length = 0;
+		this._resetDiff();
 		const { textModelN: modelN, textModelNAltVersion, textModelNSnapshotAltVersion } = this._session;
 		if (modelN.isDisposed()) {
 			return;