changes from review

Author: aiday-mar

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

@@ -196,14 +196,15 @@ export class InlineChatController implements IEditorContribution {
 	private _showWidget(initialRender: boolean = false) {
 		assertType(this._activeSession);
 		assertType(this._strategy);
+		assertType(this._editor.hasModel());
 
-		let widgetPosition: Position | null;
+		let widgetPosition: Position | undefined;
 		if (initialRender) {
 			widgetPosition = this._editor.getPosition();
 		} else {
-			widgetPosition = this._strategy.getWidgetPosition();
+			widgetPosition = this._strategy.getWidgetPosition() ?? this._zone.value.position ?? this._activeSession.wholeRange.value.getEndPosition();
 		}
-		this._zone.value.show((widgetPosition ?? this._zone.value.position) ?? this._activeSession.wholeRange.value.getEndPosition());
+		this._zone.value.show(widgetPosition);
 	}
 
 	protected async _nextState(state: State, options: InlineChatRunOptions | undefined): Promise<void> {

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

@@ -43,7 +43,7 @@ export abstract class EditModeStrategy {
 
 	abstract hasFocus(): boolean;
 
-	abstract getWidgetPosition(): Position | null;
+	abstract getWidgetPosition(): Position | undefined;
 }
 
 export class PreviewStrategy extends EditModeStrategy {
@@ -131,8 +131,8 @@ export class PreviewStrategy extends EditModeStrategy {
 		// nothing to do
 	}
 
-	getWidgetPosition(): Position | null {
-		return null;
+	getWidgetPosition(): Position | undefined {
+		return;
 	}
 
 	hasFocus(): boolean {
@@ -331,7 +331,7 @@ export class LiveStrategy extends EditModeStrategy {
 		this._widget.updateStatus(message);
 	}
 
-	private _lastLineOfLocalEdits(): number | undefined {
+	override getWidgetPosition(): Position | undefined {
 		const lastTextModelChanges = this._session.lastTextModelChanges;
 		let lastLineOfLocalEdits: number | undefined;
 		for (const change of lastTextModelChanges) {
@@ -340,16 +340,7 @@ export class LiveStrategy extends EditModeStrategy {
 				lastLineOfLocalEdits = changeEndLineNumber;
 			}
 		}
-		return lastLineOfLocalEdits;
-	}
-
-	override getWidgetPosition(): Position | null {
-		const isEditResponse = this._session.lastExchange?.response instanceof EditResponse;
-		if (isEditResponse) {
-			const lastLineOfLocalEdits = this._lastLineOfLocalEdits();
-			return lastLineOfLocalEdits ? new Position(lastLineOfLocalEdits, 1) : null;
-		}
-		return null;
+		return lastLineOfLocalEdits ? new Position(lastLineOfLocalEdits, 1) : undefined;
 	}
 
 	hasFocus(): boolean {
@@ -410,14 +401,6 @@ export class LivePreviewStrategy extends LiveStrategy {
 		scrollState.restore(this._editor);
 	}
 
-	override getWidgetPosition(): Position | null {
-		const isEditResponse = this._session.lastExchange?.response instanceof EditResponse;
-		if (isEditResponse) {
-			return this._session.wholeRange.value.getEndPosition();
-		}
-		return null;
-	}
-
 	override hasFocus(): boolean {
 		return super.hasFocus() || this._diffZone.hasFocus() || this._previewZone.hasFocus();
 	}