resetting the code as it was

Author: aiday-mar

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

@@ -249,13 +249,6 @@ export class InteractiveEditorController implements IEditorContribution {
 		return State.INIT_UI;
 	}
 
-	private _showWidget(): void {
-		assertType(this._activeSession);
-		const selectionRange = this._activeSession.wholeRange.value;
-		const position = this._strategy?.getWidgetPosition(selectionRange);
-		this._zone.value.showWidget(selectionRange, position);
-	}
-
 	private async [State.INIT_UI](options: InteractiveEditorRunOptions | undefined): Promise<State.WAIT_FOR_INPUT | State.SHOW_RESPONSE | State.APPLY_RESPONSE> {
 		assertType(this._activeSession);
 
@@ -276,9 +269,8 @@ export class InteractiveEditorController implements IEditorContribution {
 		this._zone.value.widget.placeholder = this._getPlaceholderText();
 		this._zone.value.widget.value = this._activeSession.lastInput ?? '';
 		this._zone.value.widget.updateInfo(this._activeSession.session.message ?? localize('welcome.1', "AI-generated code may be incorrect"));
+		this._zone.value.show(this._activeSession.wholeRange.value.getEndPosition());
 		this._zone.value.widget.preferredExpansionState = this._activeSession.lastExpansionState;
-		console.log('before show of the init ui');
-		this._showWidget();
 
 		this._sessionStore.add(this._editor.onDidChangeModel((e) => {
 			const msg = this._activeSession?.lastExchange
@@ -367,9 +359,7 @@ export class InteractiveEditorController implements IEditorContribution {
 		assertType(this._activeSession);
 
 		this._zone.value.widget.placeholder = this._getPlaceholderText();
-
-		console.log('before show of wait_for_input');
-		this._showWidget();
+		this._zone.value.show(this._activeSession.wholeRange.value.getEndPosition());
 
 		if (options?.message) {
 			this._zone.value.widget.value = options?.message;

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

@@ -26,7 +26,7 @@ import { EmbeddedCodeEditorWidget, EmbeddedDiffEditorWidget } from 'vs/editor/br
 import { HiddenItemStrategy, MenuWorkbenchToolBar } from 'vs/platform/actions/browser/toolbar';
 import { ProgressBar } from 'vs/base/browser/ui/progressbar/progressbar';
 import { SuggestController } from 'vs/editor/contrib/suggest/browser/suggestController';
-import { Position } from 'vs/editor/common/core/position';
+import { IPosition, Position } from 'vs/editor/common/core/position';
 import { DEFAULT_FONT_FAMILY } from 'vs/workbench/browser/style';
 import { DropdownWithDefaultActionViewItem, IMenuEntryActionViewItemOptions, MenuEntryActionViewItem, createActionViewItem } from 'vs/platform/actions/browser/menuEntryActionViewItem';
 import { CompletionItem, CompletionItemInsertTextRule, CompletionItemKind, CompletionItemProvider, CompletionList, ProviderResult, TextEdit } from 'vs/editor/common/languages';
@@ -183,7 +183,6 @@ export class InteractiveEditorWidget {
 	private _isLayouting: boolean = false;
 	private _preferredExpansionState: ExpansionState | undefined;
 	private _expansionState: ExpansionState = ExpansionState.NOT_CROPPED;
-	private _indentationWidth: number = 0;
 
 	constructor(
 		private readonly parentEditor: ICodeEditor,
@@ -465,14 +464,6 @@ export class InteractiveEditorWidget {
 		this._preferredExpansionState = expansionState;
 	}
 
-	set indentationWidth(indentationWidth: number) {
-		this._indentationWidth = indentationWidth;
-	}
-
-	get indentationWidth(): number {
-		return this._indentationWidth;
-	}
-
 	updateMarkdownMessage(message: Node | undefined) {
 		this._elements.markdownMessage.classList.toggle('hidden', !message);
 		let expansionState: ExpansionState;
@@ -772,9 +763,14 @@ export class InteractiveEditorZoneWidget extends ZoneWidget {
 	protected override _doLayout(heightInPixel: number): void {
 
 		const info = this.editor.getLayoutInfo();
+		const spaceLeft = info.lineNumbersWidth + info.glyphMarginWidth + info.decorationsWidth;
+		const spaceRight = info.minimap.minimapWidth + info.verticalScrollbarWidth;
+
 		const maxWidth = !this.widget.showsAnyPreview() ? 640 : Number.MAX_SAFE_INTEGER;
-		const width = Math.min(maxWidth, info.contentWidth - (info.glyphMarginWidth + info.decorationsWidth + this.widget.indentationWidth));
+		const width = Math.min(maxWidth, info.contentWidth - (info.glyphMarginWidth + info.decorationsWidth));
 		this._dimension = new Dimension(width, heightInPixel);
+		this.widget.domNode.style.marginLeft = `${spaceLeft}px`;
+		this.widget.domNode.style.marginRight = `${spaceRight}px`;
 		this.widget.domNode.style.width = `${width}px`;
 		this.widget.layout(this._dimension);
 	}
@@ -791,36 +787,10 @@ export class InteractiveEditorZoneWidget extends ZoneWidget {
 		super._relayout(this._computeHeightInLines());
 	}
 
-	showWidget(selectionRange: Range, position: Position | undefined): void {
-		console.log('selectionRange : ', selectionRange);
-		console.log('position : ', position);
-
-		super.show(position ?? selectionRange.getEndPosition(), this._computeHeightInLines());
+	override show(where: IPosition): void {
+		super.show(where, this._computeHeightInLines());
 		this.widget.focus();
 		this._ctxVisible.set(true);
-		this._setMargins(selectionRange);
-	}
-
-	private _setMargins(selectionRange: Range): void {
-		const info = this.editor.getLayoutInfo();
-		const startLineNumber = selectionRange.getStartPosition().lineNumber;
-		const endLineNumber = selectionRange.getEndPosition().lineNumber;
-		const viewModel = this.editor._getViewModel();
-		let indentationLineNumber = endLineNumber;
-		let indentationLevel = viewModel?.getLineFirstNonWhitespaceColumn(endLineNumber);
-		for (let lineNumber = endLineNumber; lineNumber >= startLineNumber; lineNumber--) {
-			const currentIndentationLevel = viewModel?.getLineFirstNonWhitespaceColumn(lineNumber);
-			if (currentIndentationLevel && currentIndentationLevel !== 0) {
-				indentationLineNumber = lineNumber;
-				indentationLevel = currentIndentationLevel;
-				break;
-			}
-		}
-		this.widget.indentationWidth = (indentationLevel ? this.editor.getOffsetForColumn(indentationLineNumber, indentationLevel) : 0);
-		const spaceLeft = info.lineNumbersWidth + info.glyphMarginWidth + info.decorationsWidth + this.widget.indentationWidth;
-		const spaceRight = info.minimap.minimapWidth + info.verticalScrollbarWidth;
-		this.widget.domNode.style.marginLeft = `${spaceLeft}px`;
-		this.widget.domNode.style.marginRight = `${spaceRight}px`;
 	}
 
 	override hide(): void {