Merge pull request microsoft#232140 from microsoft/joh/residential-ermine

let review cancel the session when no or no real edits happened

Author: aeschli

src/vs/workbench/contrib/chat/browser/actions/codeBlockOperations.ts

@@ -270,7 +270,7 @@ export class ApplyCodeBlockOperation {
 				let isOpen = true;
 				const firstEdit = textEdits[0];
 				editorToApply.revealLineInCenterIfOutsideViewport(firstEdit.range.startLineNumber);
-				const promise = inlineChatController.reviewEdits(textEdits[0].range, AsyncIterableObject.fromArray(textEdits), tokenSource.token);
+				const promise = inlineChatController.reviewEdits(textEdits[0].range, AsyncIterableObject.fromArray([textEdits]), tokenSource.token);
 				promise.finally(() => {
 					isOpen = false;
 					tokenSource.dispose();

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

@@ -1164,7 +1164,7 @@ export class InlineChatController implements IEditorContribution {
 		return this._currentRun;
 	}
 
-	async reviewEdits(anchor: IRange, stream: AsyncIterable<TextEdit>, token: CancellationToken) {
+	async reviewEdits(anchor: IRange, stream: AsyncIterable<TextEdit[]>, token: CancellationToken) {
 		if (!this._editor.hasModel()) {
 			return false;
 		}
@@ -1183,14 +1183,22 @@ export class InlineChatController implements IEditorContribution {
 		await Event.toPromise(Event.filter(this._onDidEnterState.event, candidate => candidate === State.SHOW_REQUEST));
 
 		for await (const chunk of stream) {
-			session.chatModel.acceptResponseProgress(request, { kind: 'textEdit', uri: this._editor.getModel()!.uri, edits: [chunk] });
+			session.chatModel.acceptResponseProgress(request, { kind: 'textEdit', uri: this._editor.getModel()!.uri, edits: chunk });
 		}
 
 		if (token.isCancellationRequested) {
 			session.chatModel.cancelRequest(request);
 		} else {
 			session.chatModel.completeResponse(request);
 		}
+
+		await Event.toPromise(Event.filter(this._onDidEnterState.event, candidate => candidate === State.WAIT_FOR_INPUT));
+
+		if (session.hunkData.pending === 0) {
+			// no real changes, just cancel
+			this.cancelSession();
+		}
+
 		await run;
 		return true;
 	}