polishing the code

Author: aiday-mar

src/vs/workbench/contrib/interactiveEditor/browser/interactiveEditor.css

@@ -109,8 +109,12 @@
 	display: none;
 }
 
+.monaco-editor .interactive-editor .markdownMessage .message * {
+	margin: unset;
+}
+
 .monaco-editor .interactive-editor .markdownMessage .message {
-	margin: 0px;
+	margin-left: 5px;
 	-webkit-line-clamp: 3;
 	-webkit-box-orient: vertical;
 	overflow: hidden;

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

@@ -408,7 +408,7 @@ export class InteractiveEditorController implements IEditorContribution {
 			store.add(this._instaService.invokeFunction(installSlashCommandSupport, this._zone.widget.inputEditor as IActiveCodeEditor, session.slashCommands));
 		}
 
-		this._zone.widget.updateMessage(session.message ?? localize('welcome.1', "AI-generated code may be incorrect."));
+		this._zone.widget.updateStatus(session.message ?? localize('welcome.1', "AI-generated code may be incorrect."));
 
 		// CANCEL when input changes
 		this._editor.onDidChangeModel(this.cancelSession, this, store);
@@ -540,7 +540,7 @@ export class InteractiveEditorController implements IEditorContribution {
 				if (!isCancellationError(e)) {
 					this._logService.error('[IE] ERROR during request', provider.debugName);
 					this._logService.error(e);
-					this._zone.widget.updateMessage(toErrorMessage(e), { classes: ['error'] });
+					this._zone.widget.updateStatus(toErrorMessage(e), { classes: ['error'] });
 					// statusWidget
 					continue;
 				}
@@ -558,7 +558,7 @@ export class InteractiveEditorController implements IEditorContribution {
 
 			if (!reply) {
 				this._logService.trace('[IE] NO reply or edits', provider.debugName);
-				this._zone.widget.updateMessage(localize('empty', "No results, please refine your input and try again."), { classes: ['warn'] });
+				this._zone.widget.updateStatus(localize('empty', "No results, please refine your input and try again."), { classes: ['warn'] });
 				continue;
 			}
 
@@ -662,7 +662,7 @@ export class InteractiveEditorController implements IEditorContribution {
 				} else {
 					message = localize('lines.N', "Generated reply and changed {0} lines.", linesChanged);
 				}
-				this._zone.widget.updateMessage(message);
+				this._zone.widget.updateStatus(message);
 			}
 
 
@@ -795,7 +795,7 @@ export class InteractiveEditorController implements IEditorContribution {
 			const kind = helpful ? InteractiveEditorResponseFeedbackKind.Helpful : InteractiveEditorResponseFeedbackKind.Unhelpful;
 			this._currentSession.provider.handleInteractiveEditorResponseFeedback?.(this._currentSession.session, this._currentSession.lastResponse instanceof EditResponse ? this._currentSession.lastResponse.raw : this._currentSession.lastResponse, kind);
 			this._ctxLastFeedbackKind.set(helpful ? 'helpful' : 'unhelpful');
-			this._zone.widget.updateMessage('Thank you for your feedback!', { resetAfter: 1250 });
+			this._zone.widget.updateStatus('Thank you for your feedback!', { resetAfter: 1250 });
 		}
 	}
 

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

@@ -152,9 +152,6 @@ class InteractiveEditorWidget {
 
 	public acceptInput: () => void = InteractiveEditorWidget._noop;
 	private _cancelInput: () => void = InteractiveEditorWidget._noop;
-
-	private _isLastStatusUpdateAMessage: boolean = false;
-
 	constructor(
 		parentEditor: ICodeEditor,
 		@IModelService private readonly _modelService: IModelService,
@@ -378,40 +375,24 @@ class InteractiveEditorWidget {
 		this._onDidChangeHeight.fire();
 	}
 
-	updateMarkdownMessage(message: Node | null) {
-		if (!message) {
-			return false;
-		}
+	updateMarkdownMessage(message: Node) {
 		reset(this._elements.message, message);
 		this._elements.statusLabel.innerText = '';
 		this._elements.markdownMessage.classList.toggle('hidden', false);
-		this._isLastStatusUpdateAMessage = true;
-		delete this._elements.statusLabel.dataset['state'];
 		this._onDidChangeHeight.fire();
 		return true;
 	}
 
-	updateMessage(message: string, ops: { classes?: string[]; resetAfter?: number } = {}): boolean {
-		if (!message) {
-			return false;
-		}
+	updateStatus(message: string, ops: { classes?: string[]; resetAfter?: number; keepMessage?: boolean } = {}) {
 		const isTempMessage = typeof ops.resetAfter === 'number';
 		if (isTempMessage && !this._elements.statusLabel.dataset['state']) {
-			const isLastMessageUpdated = this._isLastStatusUpdateAMessage;
 			const statusLabel = this._elements.statusLabel.innerText;
-			const markdownMessage = this._elements.message.firstChild;
 			const classes = Array.from(this._elements.statusLabel.classList.values());
 			setTimeout(() => {
-				let updateDone = false;
-				if (isLastMessageUpdated) {
-					updateDone = this.updateMarkdownMessage(markdownMessage);
-				} else {
-					updateDone = this.updateMessage(statusLabel, { classes });
-				}
-				if (!updateDone) {
-					reset(this._elements.statusLabel);
-				}
+				this.updateStatus(statusLabel, { classes, keepMessage: true });
 			}, ops.resetAfter);
+		} else if (!isTempMessage && !ops.keepMessage) {
+			this._elements.markdownMessage.classList.toggle('hidden', true);
 		}
 		this._elements.status.classList.toggle('hidden', false);
 		reset(this._elements.statusLabel, message);
@@ -421,10 +402,7 @@ class InteractiveEditorWidget {
 		} else {
 			delete this._elements.statusLabel.dataset['state'];
 		}
-		this._elements.markdownMessage.classList.toggle('hidden', true);
-		this._isLastStatusUpdateAMessage = false;
 		this._onDidChangeHeight.fire();
-		return true;
 	}
 
 	reset() {