mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-28 21:32:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix merge-conflict

Browse source
This commit is contained in:
Conrad Irwin 2023-08-25 11:08:39 -06:00
parent f18cdcba54
commit bde67b2b9c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/editor/src/element.rs
View file

@ -2365,6 +2365,7 @@ impl Element<Editor> for EditorElement {
editor.cursor_shape,
&snapshot.display_snapshot,
true,
true,
)
.head
});
@ -3156,7 +3157,7 @@ mod tests {
let relative_rows = editor.update(cx, |editor, cx| {
let snapshot = editor.snapshot(cx);
element.calculate_relative_line_numbers(&snapshot, &(0..6), 3)
element.calculate_relative_line_numbers(&snapshot, &(0..6), Some(3))
});
assert_eq!(relative_rows[&0], 3);
assert_eq!(relative_rows[&1], 2);
@ -3169,7 +3170,7 @@ mod tests {
let relative_rows = editor.update(cx, |editor, cx| {
let snapshot = editor.snapshot(cx);
element.calculate_relative_line_numbers(&snapshot, &(3..6), 1)
element.calculate_relative_line_numbers(&snapshot, &(3..6), Some(1))
});
assert_eq!(relative_rows.len(), 3);
assert_eq!(relative_rows[&3], 2);
@ -3180,7 +3181,7 @@ mod tests {
let relative_rows = editor.update(cx, |editor, cx| {
let snapshot = editor.snapshot(cx);
element.calculate_relative_line_numbers(&snapshot, &(0..3), 6)
element.calculate_relative_line_numbers(&snapshot, &(0..3), Some(6))
});
assert_eq!(relative_rows.len(), 3);
assert_eq!(relative_rows[&0], 5);