From bde67b2b9c6fff9d1977e43efd251bff023a53b0 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Fri, 25 Aug 2023 11:08:39 -0600
Subject: [PATCH] Fix merge-conflict

---
 crates/editor/src/element.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index 2a623b9b6bcb0a14d7acb423b6407fa1b410c59e..6f93b07f654067ceb5a95eb86173396d647cc7a9 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -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);