Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix wrong picker marker (a typo during lab 4.0 migration) #688

Merged
merged 1 commit into from
Sep 27, 2023
Merged

Fix wrong picker marker (a typo during lab 4.0 migration) #688

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/nbdime/src/common/mergeview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ Add a gap DOM element between 2 editors
!hasEntries(s.decision.localDiff) &&
!hasEntries(s.decision.remoteDiff)
) {
// We have a custom decision, add picker on base only!*/
// We have a custom decision, add picker on base only!
effects = effects.concat(
this.createGutterEffects(
editor,
Expand Down Expand Up @@ -727,6 +727,7 @@ Add a gap DOM element between 2 editors
}
}
if (chunkFirstLine === chunkLastLine) {
// When the chunk is empty, make sure a horizontal line shows up
const startingOffset = posToOffset(editor.state.doc, {
line: chunkFirstLine,
column: 0,
Expand All @@ -750,13 +751,14 @@ Add a gap DOM element between 2 editors
),
);
} else if (conflict) {
// Add conflict markers on editor, if conflicted
effects = effects.concat(
this.createGutterEffects(
editor,
chunk,
startingOffset,
true,
'picker',
'conflict',
),
);
}
Expand Down
Loading