Merge pull request microsoft#186729 from microsoft/aiday/activeSessionTypeAssertion

Ending current inline chat session when new session created

Author: aiday-mar

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

@@ -176,13 +176,17 @@ export class InlineChatController implements IEditorContribution {
 		return this._zone.value.position;
 	}
 
+	private _currentRun?: Promise<void>;
+
 	async run(options: InlineChatRunOptions | undefined = {}): Promise<void> {
-		this._log('session starting');
-		await this.finishExistingSession();
+		this.finishExistingSession();
+		if (this._currentRun) {
+			await this._currentRun;
+		}
 		this._stashedSession.clear();
-
-		await this._nextState(State.CREATE_SESSION, options);
-		this._log('session done or paused');
+		this._currentRun = this._nextState(State.CREATE_SESSION, options);
+		await this._currentRun;
+		this._currentRun = undefined;
 	}
 
 	// ---- state machine
@@ -815,7 +819,7 @@ export class InlineChatController implements IEditorContribution {
 		return result;
 	}
 
-	async finishExistingSession(): Promise<void> {
+	finishExistingSession(): void {
 		if (this._activeSession) {
 			if (this._activeSession.editMode === EditMode.Preview) {
 				this._log('finishing existing session, using CANCEL', this._activeSession.editMode);

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

@@ -148,9 +148,9 @@ suite('InteractiveChatController', function () {
 
 	test('run (show/hide)', async function () {
 		ctrl = instaService.createInstance(TestController, editor);
+		const p = ctrl.waitFor(TestController.INIT_SEQUENCE_AUTO_SEND);
 		const run = ctrl.run({ message: 'Hello', autoSend: true });
-
-		await ctrl.waitFor(TestController.INIT_SEQUENCE_AUTO_SEND);
+		await p;
 		assert.ok(ctrl.getWidgetPosition() !== undefined);
 		ctrl.cancelSession();
 
@@ -218,9 +218,10 @@ suite('InteractiveChatController', function () {
 
 	test('typing outside of wholeRange finishes session', async function () {
 		ctrl = instaService.createInstance(TestController, editor);
+		const p = ctrl.waitFor(TestController.INIT_SEQUENCE_AUTO_SEND);
 		ctrl.run({ message: 'Hello', autoSend: true });
 
-		await ctrl.waitFor(TestController.INIT_SEQUENCE_AUTO_SEND);
+		await p;
 
 		const session = inlineChatSessionService.getSession(editor, editor.getModel()!.uri);
 		assert.ok(session);
@@ -257,9 +258,10 @@ suite('InteractiveChatController', function () {
 		});
 		store.add(d);
 		ctrl = instaService.createInstance(TestController, editor);
+		const p = ctrl.waitFor(TestController.INIT_SEQUENCE);
 		ctrl.run({ message: 'Hello', autoSend: false });
 
-		await ctrl.waitFor(TestController.INIT_SEQUENCE);
+		await p;
 
 		const session = inlineChatSessionService.getSession(editor, editor.getModel()!.uri);
 		assert.ok(session);
@@ -298,12 +300,13 @@ suite('InteractiveChatController', function () {
 		});
 		store.add(d);
 		ctrl = instaService.createInstance(TestController, editor);
-		const p = ctrl.run({ message: 'Hello', autoSend: true });
+		const p = ctrl.waitFor([...TestController.INIT_SEQUENCE, State.MAKE_REQUEST]);
+		const r = ctrl.run({ message: 'Hello', autoSend: true });
 
-		await ctrl.waitFor([...TestController.INIT_SEQUENCE, State.MAKE_REQUEST]);
+		await p;
 		ctrl.acceptSession();
 
-		await p;
+		await r;
 		assert.strictEqual(ctrl.getWidgetPosition(), undefined);
 	});
 });