From 595e7d42758bd8a2b4e131fd0d56bd433fa420b7 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 19 Dec 2023 17:55:40 +0100 Subject: [PATCH] fix https://github.com/microsoft/vscode/issues/201197 (#201221) --- .../inlineChat/browser/inlineChatController.ts | 6 +----- .../inlineChat/browser/inlineChatStrategies.ts | 15 --------------- .../inlineChat/browser/inlineChatWidget.ts | 6 ++---- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts index e0275a27347..09916ea134b 100644 --- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts +++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts @@ -279,7 +279,6 @@ export class InlineChatController implements IEditorContribution { widgetPosition = this._editor.getSelection().getStartPosition().delta(-1); } - let needsMargin = false; if (initialRender) { this._zone.value.setContainerMargins(); } @@ -290,11 +289,8 @@ export class InlineChatController implements IEditorContribution { if (this._activeSession) { this._zone.value.updateBackgroundColor(widgetPosition, this._activeSession.wholeRange.value); } - if (this._strategy) { - needsMargin = this._strategy.needsMargin(); - } if (!this._zone.value.position) { - this._zone.value.setWidgetMargins(widgetPosition, !needsMargin ? 0 : undefined); + this._zone.value.setWidgetMargins(widgetPosition); this._zone.value.show(widgetPosition); } else { this._zone.value.updatePositionAndHeight(widgetPosition); diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts index 63585ac7436..cf1efe13aac 100644 --- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts +++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.ts @@ -75,8 +75,6 @@ export abstract class EditModeStrategy { abstract renderChanges(response: ReplyResponse): Promise; abstract hasFocus(): boolean; - - abstract needsMargin(): boolean; } export class PreviewStrategy extends EditModeStrategy { @@ -165,10 +163,6 @@ export class PreviewStrategy extends EditModeStrategy { hasFocus(): boolean { return this._zone.widget.hasFocus(); } - - needsMargin(): boolean { - return true; - } } @@ -307,11 +301,6 @@ export class LivePreviewStrategy extends EditModeStrategy { this._zone.widget.updateStatus(message); } - override needsMargin(): boolean { - return true; - } - - private async _updateDiffZones() { const diff = await this._editorWorkerService.computeDiff(this._session.textModel0.uri, this._session.textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: 5000, computeMoves: false }, 'advanced'); if (!diff || diff.changes.length === 0) { @@ -901,10 +890,6 @@ export class LiveStrategy extends EditModeStrategy { this._zone.widget.updateStatus(message); } - override needsMargin(): boolean { - return true; - } - hasFocus(): boolean { return this._zone.widget.hasFocus(); } diff --git a/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts b/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts index b98fd9997cf..beacd0fdcf4 100644 --- a/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts +++ b/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts @@ -1042,10 +1042,8 @@ export class InlineChatZoneWidget extends ZoneWidget { this.container.style.marginLeft = `${marginWithoutIndentation}px`; } - setWidgetMargins(position: Position, indentationWidth?: number): void { - if (indentationWidth === undefined) { - indentationWidth = this._calculateIndentationWidth(position); - } + setWidgetMargins(position: Position): void { + const indentationWidth = this._calculateIndentationWidth(position); if (this._indentationWidth === indentationWidth) { return; }