[WIP] file watching

helix-term/src/application.rs

@@ -1,6 +1,6 @@
 use helix_core::syntax;
 use helix_lsp::{lsp, util::lsp_pos_to_pos, LspProgressMap};
-use helix_view::{theme, Editor};
+use helix_view::{file_watcher, theme, Editor};
 
 use crate::{args::Args, compositor::Compositor, config::Config, job::Jobs, ui};
 
@@ -85,7 +85,7 @@ impl Application {
             theme_loader.clone(),
             syn_loader.clone(),
             config.editor.clone(),
-        );
+        )?;
 
         let editor_view = Box::new(ui::EditorView::new(std::mem::take(&mut config.keys)));
         compositor.push(editor_view);
@@ -192,6 +192,9 @@ impl Application {
                     self.jobs.handle_callback(&mut self.editor, &mut self.compositor, callback);
                     self.render();
                 }
+                Some(msg) = self.editor.watcher_receiver.recv() => {
+                    self.handle_watcher_message(msg)
+                }
             }
         }
     }
@@ -490,6 +493,17 @@ impl Application {
         }
     }
 
+    fn handle_watcher_message(&mut self, msg: file_watcher::Message) {
+        match msg {
+            file_watcher::Message::NotifyEvents(event) => {
+                log::info!("handling file watcher event: {:?}", event);
+            }
+                // match event.unwrap() {
+                // _ => unimplemented!(),
+            // },
+        }
+    }
+
     async fn claim_term(&mut self) -> Result<(), Error> {
         terminal::enable_raw_mode()?;
         let mut stdout = stdout();

helix-view/Cargo.toml

@@ -38,6 +38,8 @@ log = "~0.4"
 
 which = "4.2"
 
+notify = "=5.0.0-pre.11"    # check that it builds on NetBSD before upgrading
+
 [target.'cfg(windows)'.dependencies]
 clipboard-win = { version = "4.2", features = ["std"] }
 

helix-view/src/editor.rs

@@ -1,5 +1,6 @@
 use crate::{
     clipboard::{get_clipboard_provider, ClipboardProvider},
+    file_watcher::{self, ActorMessage, ActorMessageKind, NotifyActor, NotifyHandle},
     graphics::{CursorKind, Rect},
     theme::{self, Theme},
     tree::Tree,
@@ -8,14 +9,19 @@ use crate::{
 
 use futures_util::future;
 use std::{
+    collections::HashMap,
     path::{Path, PathBuf},
     sync::Arc,
     time::Duration,
 };
+use tokio::sync::{
+    mpsc::{unbounded_channel, UnboundedReceiver},
+    oneshot,
+};
 
 use slotmap::SlotMap;
 
-use anyhow::Error;
+use anyhow::{Context, Error};
 
 pub use helix_core::diagnostic::Severity;
 pub use helix_core::register::Registers;
@@ -65,12 +71,15 @@ impl Default for Config {
 pub struct Editor {
     pub tree: Tree,
     pub documents: SlotMap<DocumentId, Document>,
+    pub path_to_doc: HashMap<PathBuf, DocumentId>,
     pub count: Option<std::num::NonZeroUsize>,
     pub selected_register: RegisterSelection,
     pub registers: Registers,
     pub theme: Theme,
     pub language_servers: helix_lsp::Registry,
     pub clipboard_provider: Box<dyn ClipboardProvider>,
+    pub watcher: Arc<NotifyHandle>,
+    pub watcher_receiver: UnboundedReceiver<file_watcher::Message>,
 
     pub syn_loader: Arc<syntax::Loader>,
     pub theme_loader: Arc<theme::Loader>,
@@ -94,15 +103,22 @@ impl Editor {
         themes: Arc<theme::Loader>,
         config_loader: Arc<syntax::Loader>,
         config: Config,
-    ) -> Self {
+    ) -> anyhow::Result<Self> {
         let language_servers = helix_lsp::Registry::new();
+        let (watcher, watcher_receiver) = {
+            let (watcher_sender, watcher_receiver) = unbounded_channel();
+            let watcher = NotifyActor::spawn(Box::new(move |e| watcher_sender.send(e).unwrap()))
+                .context("Failed to spawn watcher")?;
+            (Arc::new(watcher), watcher_receiver)
+        };
 
         // HAXX: offset the render area height by 1 to account for prompt/commandline
         area.height -= 1;
 
-        Self {
+        Ok(Self {
             tree: Tree::new(area),
             documents: SlotMap::with_key(),
+            path_to_doc: HashMap::default(),
             count: None,
             selected_register: RegisterSelection::default(),
             theme: themes.default(),
@@ -111,9 +127,11 @@ impl Editor {
             theme_loader: themes,
             registers: Registers::default(),
             clipboard_provider: get_clipboard_provider(),
+            watcher,
+            watcher_receiver,
             status_msg: None,
             config,
-        }
+        })
     }
 
     pub fn clear_status(&mut self) {
@@ -231,10 +249,7 @@ impl Editor {
     pub fn open(&mut self, path: PathBuf, action: Action) -> Result<DocumentId, Error> {
         let path = crate::document::canonicalize_path(&path)?;
 
-        let id = self
-            .documents()
-            .find(|doc| doc.path() == Some(&path))
-            .map(|doc| doc.id);
+        let id = self.path_to_doc.get(&path).map(|it| *it);
 
         let id = if let Some(id) = id {
             id
@@ -266,6 +281,13 @@ impl Editor {
 
             let id = self.documents.insert(doc);
             self.documents[id].id = id;
+            self.path_to_doc.insert(path.clone(), id);
+            {
+                let watcher = self.watcher.clone();
+                tokio::spawn(async move {
+                    watcher.watch(path.clone()).await;
+                });
+            }
             id
         };