cleaning up the code

Author: aiday-mar

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

@@ -247,7 +247,6 @@ export class InteractiveEditorController implements IEditorContribution {
 		}
 
 		this._activeSession = session;
-		this._activeSession.newlySelected = true;
 		return State.INIT_UI;
 	}
 
@@ -272,6 +271,7 @@ export class InteractiveEditorController implements IEditorContribution {
 		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.getEndPosition());
+		this._zone.value.widget.preferredExpansionState = this._activeSession.lastExpansionState;
 
 		this._sessionStore.add(this._editor.onDidChangeModel((e) => {
 			const msg = this._activeSession?.lastExchange
@@ -557,10 +557,7 @@ export class InteractiveEditorController implements IEditorContribution {
 			this._zone.value.widget.updateStatus('');
 			this._zone.value.widget.updateMarkdownMessage(renderedMarkdown.element);
 			this._zone.value.widget.updateToolbar(true);
-			const expansionState = this._activeSession.newlySelected ? (this._activeSession.lastExpansionState ?? this._zone.value.widget.expansionState) : this._zone.value.widget.expansionState;
-			this._activeSession.newlySelected = false;
-			this._activeSession.lastExpansionState = expansionState;
-			this._zone.value.widget.updateMarkdownMessageExpansionState(expansionState);
+			this._activeSession.lastExpansionState = this._zone.value.widget.expansionState;
 
 		} else if (response instanceof EditResponse) {
 			// edit response -> complex...

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

@@ -63,7 +63,6 @@ export enum ExpansionState {
 
 export class Session {
 
-	private _newlySelected: boolean = false;
 	private _lastInput: string | undefined;
 	private _lastExpansionState: ExpansionState | undefined;
 	private _lastTextModelChanges: LineRangeMapping[] | undefined;
@@ -95,14 +94,6 @@ export class Session {
 		};
 	}
 
-	get newlySelected() {
-		return this._newlySelected;
-	}
-
-	set newlySelected(value: boolean) {
-		this._newlySelected = value;
-	}
-
 	addInput(input: string): void {
 		this._lastInput = input;
 	}

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

@@ -183,6 +183,7 @@ export class InteractiveEditorWidget {
 
 	private _lastDim: Dimension | undefined;
 	private _isLayouting: boolean = false;
+	private _preferredExpansionState: ExpansionState | undefined;
 	private _expansionState: ExpansionState = ExpansionState.NOT_CROPPED;
 
 	constructor(
@@ -446,22 +447,44 @@ export class InteractiveEditorWidget {
 		return this._expansionState;
 	}
 
+	set preferredExpansionState(expansionState: ExpansionState | undefined) {
+		this._preferredExpansionState = expansionState;
+	}
+
 	updateMarkdownMessage(message: Node | undefined) {
 		this._elements.markdownMessage.classList.toggle('hidden', !message);
+		let expansionState: ExpansionState;
 		if (!message) {
 			reset(this._elements.message);
 			this._ctxMessageCropState.reset();
-			this._expansionState = ExpansionState.NOT_CROPPED;
+			expansionState = ExpansionState.NOT_CROPPED;
 		} else {
-			this._elements.message.style.webkitLineClamp = MESSAGE_CROPPED_NUMBER_LINES.toString();
-			reset(this._elements.message, message);
-			const expansionState = this._elements.message.scrollHeight > this._elements.message.clientHeight ? ExpansionState.CROPPED : ExpansionState.NOT_CROPPED;
+			if (this._preferredExpansionState) {
+				reset(this._elements.message, message);
+				expansionState = this._preferredExpansionState;
+				this._preferredExpansionState = undefined;
+			} else {
+				this._elements.message.style.webkitLineClamp = MESSAGE_CROPPED_NUMBER_LINES.toString();
+				reset(this._elements.message, message);
+				expansionState = this._elements.message.scrollHeight > this._elements.message.clientHeight ? ExpansionState.CROPPED : ExpansionState.NOT_CROPPED;
+			}
 			this._ctxMessageCropState.set(expansionState);
-			this._expansionState = expansionState;
+			this.updateLineClamp(expansionState);
 		}
+		this._expansionState = expansionState;
+		this._onDidChangeHeight.fire();
+	}
+
+	updateMarkdownMessageExpansionState(expansionState: ExpansionState) {
+		this._ctxMessageCropState.set(expansionState);
+		this.updateLineClamp(expansionState);
 		this._onDidChangeHeight.fire();
 	}
 
+	updateLineClamp(expansionState: ExpansionState) {
+		this._elements.message.style.webkitLineClamp = expansionState === ExpansionState.NOT_CROPPED ? 'none' : (expansionState === ExpansionState.EXPANDED ? MESSAGE_EXPANDED_NUMBER_LINES.toString() : MESSAGE_CROPPED_NUMBER_LINES.toString());
+	}
+
 	updateInfo(message: string): void {
 		this._elements.infoLabel.classList.toggle('hidden', !message);
 		this._elements.infoLabel.innerText = message;
@@ -510,13 +533,6 @@ export class InteractiveEditorWidget {
 		this._inputEditor.focus();
 	}
 
-	updateMarkdownMessageExpansionState(expansionState: ExpansionState) {
-		this._ctxMessageCropState.set(expansionState);
-		this._expansionState = expansionState;
-		this._elements.message.style.webkitLineClamp = expansionState === ExpansionState.NOT_CROPPED ? 'none' : (expansionState === ExpansionState.EXPANDED ? MESSAGE_EXPANDED_NUMBER_LINES.toString() : MESSAGE_CROPPED_NUMBER_LINES.toString());
-		this._onDidChangeHeight.fire();
-	}
-
 	// --- preview
 
 	showEditsPreview(textModelv0: ITextModel, edits: ISingleEditOperation[], changes: LineRangeMapping[]) {