Merge branch 'main' into aiday/inlineChatEndOfSelection

Author: aiday-mar

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

@@ -202,8 +202,13 @@ export class InlineChatController implements IEditorContribution {
 		let widgetPosition: Position | undefined;
 		if (initialRender) {
 			widgetPosition = this._editor.getSelection().getEndPosition();
+			this._zone.value.setMargins(widgetPosition);
 		} else {
 			widgetPosition = this._strategy.getWidgetPosition() ?? this._zone.value.position ?? this._activeSession.wholeRange.value.getEndPosition();
+			const needsMargin = this._strategy.needsMargin();
+			if (!needsMargin) {
+				this._zone.value.setMargins(widgetPosition, 0);
+			}
 		}
 		this._zone.value.show(widgetPosition);
 	}

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

@@ -47,6 +47,8 @@ export abstract class EditModeStrategy {
 	abstract hasFocus(): boolean;
 
 	abstract getWidgetPosition(): Position | undefined;
+
+	abstract needsMargin(): boolean;
 }
 
 export class PreviewStrategy extends EditModeStrategy {
@@ -145,6 +147,10 @@ export class PreviewStrategy extends EditModeStrategy {
 	hasFocus(): boolean {
 		return this._widget.hasFocus();
 	}
+
+	needsMargin(): boolean {
+		return true;
+	}
 }
 
 class InlineDiffDecorations {
@@ -359,6 +365,10 @@ export class LiveStrategy extends EditModeStrategy {
 		return lastLineOfLocalEdits ? new Position(lastLineOfLocalEdits, 1) : undefined;
 	}
 
+	override needsMargin(): boolean {
+		return Boolean(this._session.lastTextModelChanges.length);
+	}
+
 	hasFocus(): boolean {
 		return this._widget.hasFocus();
 	}

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

@@ -795,13 +795,12 @@ export class InlineChatZoneWidget extends ZoneWidget {
 		super.show(position, this._computeHeightInLines());
 		this.widget.focus();
 		this._ctxVisible.set(true);
-		this._setMargins(position);
 	}
 
-	private _setMargins(position: Position): void {
+	private _calculateIndentationWidth(position: Position): number {
 		const viewModel = this.editor._getViewModel();
 		if (!viewModel) {
-			return;
+			return 0;
 		}
 		const visibleRange = viewModel.getCompletelyVisibleViewRange();
 		const startLineVisibleRange = visibleRange.startLineNumber;
@@ -816,7 +815,17 @@ export class InlineChatZoneWidget extends ZoneWidget {
 				break;
 			}
 		}
-		this._indentationWidth = this.editor.getOffsetForColumn(indentationLineNumber ?? positionLine, indentationLevel ?? viewModel.getLineFirstNonWhitespaceColumn(positionLine));
+		return this.editor.getOffsetForColumn(indentationLineNumber ?? positionLine, indentationLevel ?? viewModel.getLineFirstNonWhitespaceColumn(positionLine));
+	}
+
+	setMargins(position: Position, indentationWidth?: number): void {
+		if (indentationWidth === undefined) {
+			indentationWidth = this._calculateIndentationWidth(position);
+		}
+		if (this._indentationWidth === indentationWidth) {
+			return;
+		}
+		this._indentationWidth = indentationWidth;
 		const info = this.editor.getLayoutInfo();
 		const marginWithoutIndentation = info.glyphMarginWidth + info.decorationsWidth + info.lineNumbersWidth;
 		const marginWithIndentation = marginWithoutIndentation + this._indentationWidth;