From f1789f1e30c0c53d5132d87c2ce3bc2b07348239 Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Fri, 30 Sep 2022 15:46:17 +0200 Subject: [PATCH] Fixes #162275 --- .../contrib/mergeEditor/browser/view/conflictActions.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts index 6a2fd58509c..dfb6979f5b1 100644 --- a/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts +++ b/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts @@ -320,6 +320,15 @@ class ActionsContentWidget extends Disposable implements IContentWidget { } getPosition(): IContentWidgetPosition | null { + // We cannot put the content widget after line 0, as line 0 gets normalized to line 1. + // Thus, we put the content widget before line 1 to make it slightly less buggy. + // TODO: Fix this properly. + if (this.lineNumber === 0) { + return { + position: { lineNumber: 1, column: 1, }, + preference: [ContentWidgetPositionPreference.ABOVE], + }; + } return { position: { lineNumber: this.lineNumber, column: 1, }, preference: [ContentWidgetPositionPreference.BELOW],