Experiment: accepting suggestion without dismissing widget.

Author: rebornix

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

@@ -22,6 +22,7 @@ import { IRange, Range } from 'vs/editor/common/core/range';
 import { Selection } from 'vs/editor/common/core/selection';
 import { LineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
 import { IEditorContribution, IEditorDecorationsCollection, ScrollType } from 'vs/editor/common/editorCommon';
+import { TextEdit } from 'vs/editor/common/languages';
 import { ICursorStateComputer, IModelDecorationOptions, IModelDeltaDecoration, IValidEditOperation } from 'vs/editor/common/model';
 import { ModelDecorationOptions, createTextBufferFactoryFromSnapshot } from 'vs/editor/common/model/textModel';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorker';
@@ -582,6 +583,12 @@ export class InteractiveEditorController implements IEditorContribution {
 		}
 	}
 
+	acceptLast(): void {
+		if (this._activeSession?.lastExchange?.response instanceof EditResponse && this._strategy) {
+			this._activeSession.lastExchange.accepted = true;
+		}
+	}
+
 	async applyChanges(): Promise<EditResponse | void> {
 		if (this._activeSession?.lastExchange?.response instanceof EditResponse && this._strategy) {
 			const strategy = this._strategy;
@@ -757,11 +764,26 @@ class LiveStrategy extends EditModeStrategy {
 	}
 
 	async cancel() {
-		const { modelN, model0 } = this._session;
+		const { modelN, model0, exchanges, lastExchange } = this._session;
 		if (modelN.isDisposed() || model0.isDisposed()) {
 			return;
 		}
-		const edits = await this._editorWorkerService.computeMoreMinimalEdits(modelN.uri, [{ range: modelN.getFullModelRange(), text: model0.getValue() }]);
+
+		if (lastExchange?.accepted) {
+			return;
+		}
+
+		// find the last exchange which is accepted
+		const lastAcceptedExchange = exchanges.reverse().find(exchange => exchange.accepted);
+		let edits: TextEdit[] | undefined = undefined;
+		if (lastAcceptedExchange && lastAcceptedExchange.response instanceof EditResponse) {
+			// apply change on model0 with the last accepted exchange, and then compute minimal edits to apply on modelN
+			model0.applyEdits(lastAcceptedExchange.response.localEdits);
+			edits = await this._editorWorkerService.computeMoreMinimalEdits(modelN.uri, [{ range: modelN.getFullModelRange(), text: model0.getValue() }]);
+		} else {
+			edits = await this._editorWorkerService.computeMoreMinimalEdits(modelN.uri, [{ range: modelN.getFullModelRange(), text: model0.getValue() }]);
+		}
+
 		if (edits) {
 			const operations = edits.map(e => EditOperation.replace(Range.lift(e.range), e.text));
 			modelN.pushEditOperations(null, operations, () => null);

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

@@ -71,6 +71,10 @@ export class Session {
 		this._teldata.rounds += `${newLen}|`;
 	}
 
+	get exchanges(): SessionExchange[] {
+		return this._exchange;
+	}
+
 	get lastExchange(): SessionExchange | undefined {
 		return this._exchange[this._exchange.length - 1];
 	}
@@ -97,6 +101,16 @@ 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

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

@@ -7,6 +7,7 @@ import { Iterable } from 'vs/base/common/iterator';
 import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { URI, UriComponents } from 'vs/base/common/uri';
 import { CancellationTokenSource } from 'vs/base/common/cancellation';
+import { isEqual } from 'vs/base/common/resources';
 import { ITextModel } from 'vs/editor/common/model';
 import { ISelection } from 'vs/editor/common/core/selection';
 import { ILanguageService } from 'vs/editor/common/languages/language';
@@ -30,6 +31,8 @@ import { Schemas } from 'vs/base/common/network';
 import { IDebugService } from 'vs/workbench/contrib/debug/common/debug';
 import { IInteractiveEditorRequest, IInteractiveEditorService } from 'vs/workbench/contrib/interactiveEditor/common/interactiveEditor';
 import { ICellRange } from 'vs/workbench/contrib/notebook/common/notebookRange';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { InteractiveEditorController } from 'vs/workbench/contrib/interactiveEditor/browser/interactiveEditorController';
 
 const EXECUTE_NOTEBOOK_COMMAND_ID = 'notebook.execute';
 const CANCEL_NOTEBOOK_COMMAND_ID = 'notebook.cancelExecution';
@@ -206,7 +209,26 @@ registerAction2(class ExecuteCell extends NotebookMultiCellAction {
 			await context.notebookEditor.focusNotebookCell(context.cell, 'container', { skipReveal: true });
 		}
 
-		return runCell(editorGroupsService, context);
+		let foundEditor: ICodeEditor | undefined = undefined;
+		for (const [, codeEditor] of context.notebookEditor.codeEditors) {
+			if (isEqual(codeEditor.getModel()?.uri, (context.cell ?? context.selectedCells?.[0])?.uri)) {
+				foundEditor = codeEditor;
+				break;
+			}
+		}
+
+		await runCell(editorGroupsService, context);
+
+		if (!foundEditor) {
+			return;
+		}
+
+		const controller = InteractiveEditorController.get(foundEditor);
+		if (!controller) {
+			return;
+		}
+
+		controller.acceptLast();
 	}
 });