update the diff gutter when changing diff source config or saving

Author: doy

helix-term/src/application.rs

@@ -13,7 +13,7 @@ use helix_lsp::{
 use helix_view::{
     align_view,
     document::DocumentSavedEventResult,
-    editor::{ConfigEvent, EditorEvent},
+    editor::{ConfigEvent, DiffSource, EditorEvent},
     graphics::Rect,
     theme,
     tree::Layout,
@@ -359,11 +359,15 @@ impl Application {
             // the Application can apply it.
             ConfigEvent::Update(editor_config) => {
                 let mut app_config = (*self.config.load().clone()).clone();
+                let update_diff_base = app_config.editor.diff_source != editor_config.diff_source;
                 app_config.editor = *editor_config;
                 if let Err(err) = self.terminal.reconfigure(app_config.editor.clone().into()) {
                     self.editor.set_error(err.to_string());
                 };
                 self.config.store(Arc::new(app_config));
+                if update_diff_base {
+                    self.editor.update_diff_base();
+                }
             }
         }
 
@@ -565,6 +569,18 @@ impl Application {
             self.editor.refresh_language_servers(id);
         }
 
+        if self.editor.config().diff_source == DiffSource::File {
+            // borrowing the same doc again to get around the borrow checker
+            let doc = doc_mut!(self.editor, &doc_save_event.doc_id);
+            if let Some(path) = doc.path().cloned() {
+                doc.update_diff_base(
+                    diff_provider!(self.editor),
+                    &path,
+                    self.editor.redraw_handle.clone(),
+                );
+            }
+        }
+
         // TODO: fix being overwritten by lsp
         self.editor.set_status(format!(
             "'{}' written, {}L {}B",

helix-view/src/document.rs

@@ -1023,17 +1023,7 @@ impl Document {
 
         self.detect_indent_and_line_ending();
 
-        match diff_provider.and_then(|provider| match provider.get_diff_base(&path) {
-            Ok(res) => Some(res),
-            Err(err) => {
-                log::info!("{err:#?}");
-                log::info!("failed to open diff base for {}", path.display());
-                None
-            }
-        }) {
-            Some(diff_base) => self.set_diff_base(diff_base, redraw_handle),
-            None => self.diff_handle = None,
-        }
+        self.update_diff_base(diff_provider, &path, redraw_handle);
 
         self.version_control_head = vcs_registry
             .root_for_file(&path)
@@ -1593,7 +1583,26 @@ impl Document {
     }
 
     /// Intialize/updates the differ for this document with a new base.
-    pub fn set_diff_base(&mut self, diff_base: Vec<u8>, redraw_handle: RedrawHandle) {
+    pub fn update_diff_base(
+        &mut self,
+        diff_provider: Option<&dyn DiffProvider>,
+        path: &Path,
+        redraw_handle: RedrawHandle,
+    ) {
+        match diff_provider.and_then(|provider| match provider.get_diff_base(path) {
+            Ok(res) => Some(res),
+            Err(err) => {
+                log::info!("{err:#?}");
+                log::info!("failed to open diff base for {}", path.display());
+                None
+            }
+        }) {
+            Some(diff_base) => self.set_diff_base(diff_base, redraw_handle),
+            None => self.diff_handle = None,
+        }
+    }
+
+    fn set_diff_base(&mut self, diff_base: Vec<u8>, redraw_handle: RedrawHandle) {
         if let Ok((diff_base, ..)) = from_reader(&mut diff_base.as_slice(), Some(self.encoding)) {
             if let Some(differ) = &self.diff_handle {
                 differ.update_diff_base(diff_base);

helix-view/src/editor.rs

@@ -1468,18 +1468,7 @@ impl Editor {
                 self.config.clone(),
             )?;
 
-            if let Some(diff_base) = diff_provider!(self).as_ref().and_then(|provider| {
-                match provider.get_diff_base(&path) {
-                    Ok(res) => Some(res),
-                    Err(err) => {
-                        log::info!("{err:#?}");
-                        log::info!("failed to open diff base for {}", path.display());
-                        None
-                    }
-                }
-            }) {
-                doc.set_diff_base(diff_base, self.redraw_handle.clone());
-            }
+            doc.update_diff_base(diff_provider!(self), &path, self.redraw_handle.clone());
             doc.set_version_control_head(
                 self.vcs_providers
                     .root_for_file(&path)
@@ -1856,6 +1845,14 @@ impl Editor {
             .as_ref()
             .and_then(|debugger| debugger.current_stack_frame())
     }
+
+    pub fn update_diff_base(&mut self) {
+        for doc in self.documents.values_mut() {
+            if let Some(path) = doc.path().cloned() {
+                doc.update_diff_base(diff_provider!(self), &path, self.redraw_handle.clone());
+            }
+        }
+    }
 }
 
 fn try_restore_indent(doc: &mut Document, view: &mut View) {