hackity hack

Cole Miller created 3 weeks ago

Change summary

crates/editor/src/editor.rs  |  6 ------
crates/editor/src/element.rs | 16 ++++++++--------
crates/editor/src/split.rs   | 14 ++++++++++++--
3 files changed, 20 insertions(+), 16 deletions(-)

Detailed changes

crates/editor/src/editor.rs

@@ -1204,7 +1204,6 @@ pub struct Editor {
     applicable_language_settings: HashMap<Option<LanguageName>, LanguageSettings>,
     accent_overrides: Vec<SharedString>,
     fetched_tree_sitter_chunks: HashMap<ExcerptId, HashSet<Range<BufferRow>>>,
-    use_base_text_line_numbers: bool,
 }
 
 fn debounce_value(debounce_ms: u64) -> Option<Duration> {
@@ -2351,7 +2350,6 @@ impl Editor {
             applicable_language_settings: HashMap::default(),
             accent_overrides: Vec::new(),
             fetched_tree_sitter_chunks: HashMap::default(),
-            use_base_text_line_numbers: false,
         };
 
         if is_minimap {
@@ -19277,10 +19275,6 @@ impl Editor {
         self.display_map.read(cx).fold_placeholder.clone()
     }
 
-    pub fn set_use_base_text_line_numbers(&mut self, show: bool, _cx: &mut Context<Self>) {
-        self.use_base_text_line_numbers = show;
-    }
-
     pub fn set_expand_all_diff_hunks(&mut self, cx: &mut App) {
         self.buffer.update(cx, |buffer, cx| {
             buffer.set_all_diff_hunks_expanded(cx);

crates/editor/src/element.rs

@@ -3278,14 +3278,14 @@ impl EditorElement {
                 row_info.buffer_row? + 1
             };
             let relative_number = relative_rows.get(&display_row);
-            if !(relative_line_numbers_enabled && relative_number.is_some())
-                && row_info
-                    .diff_status
-                    .is_some_and(|status| status.is_deleted())
-                && !self.editor.read(cx).use_base_text_line_numbers
-            {
-                return None;
-            }
+            // FIXME
+            // if !(relative_line_numbers_enabled && relative_number.is_some())
+            //     && row_info
+            //         .diff_status
+            //         .is_some_and(|status| status.is_deleted())
+            // {
+            //     return None;
+            // }
 
             let number = relative_number.unwrap_or(&non_relative_number);
             write!(&mut line_number, "{number}").unwrap();

crates/editor/src/split.rs

@@ -380,6 +380,11 @@ impl SecondaryEditor {
             })
             .collect();
 
+        let diff = primary_multibuffer
+            .diff_for(main_buffer.remote_id())
+            .unwrap();
+        let main_buffer = primary_multibuffer.buffer(main_buffer.remote_id()).unwrap();
+
         self.editor.update(cx, |editor, cx| {
             editor.buffer().update(cx, |buffer, cx| {
                 buffer.update_path_excerpts(
@@ -388,7 +393,13 @@ impl SecondaryEditor {
                     &base_text_buffer_snapshot,
                     new,
                     cx,
-                )
+                );
+                buffer.add_inverted_diff(
+                    base_text_buffer_snapshot.remote_id(),
+                    diff,
+                    main_buffer,
+                    cx,
+                );
             })
         });
     }
@@ -432,6 +443,5 @@ mod tests {
         let editor = cx.new_window_entity(|window, cx| {
             SplittableEditor::new_unsplit(multibuffer, project, workspace, window, cx)
         });
-        
     }
 }