development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-12 06:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #162444 from microsoft/hediet/classic-cheetah

Browse source 
Fixes #162275
This commit is contained in:
Henning Dieterichs 2022-10-03 10:44:28 +02:00 committed by GitHub
parent 029ed84d6d f1789f1e30
commit c6313652fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.ts
View file

@ -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],