1 files changed, 80 insertions, 0 deletions

diff --git a/crates/vfs/src/loader.rs b/crates/vfs/src/loader.rs
index 40cf96020..d3bdae562 100644
--- a/crates/vfs/src/loader.rs
+++ b/crates/vfs/src/loader.rs
@@ -3,9 +3,12 @@ use std::fmt;
 
 use paths::{AbsPath, AbsPathBuf};
 
+/// A set of files on the file system.
 #[derive(Debug, Clone)]
 pub enum Entry {
+    /// The `Entry` is represented by a raw set of files.
     Files(Vec<AbsPathBuf>),
+    /// The `Entry` is represented by `Directories`.
     Directories(Directories),
 }
 
@@ -17,6 +20,8 @@ pub enum Entry {
 ///   * it is not under `exclude` path
 ///
 /// If many include/exclude paths match, the longest one wins.
+///
+/// If a path is in both `include` and `exclude`, the `exclude` one wins.
 #[derive(Debug, Clone, Default)]
 pub struct Directories {
     pub extensions: Vec<String>,
@@ -24,45 +29,99 @@ pub struct Directories {
     pub exclude: Vec<AbsPathBuf>,
 }
 
+/// [`Handle`]'s configuration.
 #[derive(Debug)]
 pub struct Config {
+    /// Set of initially loaded files.
     pub load: Vec<Entry>,
+    /// Index of watched entries in `load`.
+    ///
+    /// If a path in a watched entry is modified,the [`Handle`] should notify it.
     pub watch: Vec<usize>,
 }
 
+/// Message about an action taken by a [`Handle`].
 pub enum Message {
+    /// Indicate a gradual progress.
+    ///
+    /// This is supposed to be the number of loaded files.
     Progress { n_total: usize, n_done: usize },
+    /// The handle loaded the following files' content.
     Loaded { files: Vec<(AbsPathBuf, Option<Vec<u8>>)> },
 }
 
+/// Type that will receive [`Messages`](Message) from a [`Handle`].
 pub type Sender = Box<dyn Fn(Message) + Send>;
 
+/// Interface for reading and watching files.
 pub trait Handle: fmt::Debug {
+    /// Spawn a new handle with the given `sender`.
     fn spawn(sender: Sender) -> Self
     where
         Self: Sized;
+
+    /// Set this handle's configuration.
     fn set_config(&mut self, config: Config);
+
+    /// The file's content at `path` has been modified, and should be reloaded.
     fn invalidate(&mut self, path: AbsPathBuf);
+
+    /// Load the content of the given file, returning [`None`] if it does not
+    /// exists.
     fn load_sync(&mut self, path: &AbsPath) -> Option<Vec<u8>>;
 }
 
 impl Entry {
+    /// Returns:
+    /// ```text
+    /// Entry::Directories(Directories {
+    ///     extensions: ["rs"],
+    ///     include: [base],
+    ///     exclude: [base/.git],
+    /// })
+    /// ```
     pub fn rs_files_recursively(base: AbsPathBuf) -> Entry {
         Entry::Directories(dirs(base, &[".git"]))
     }
+
+    /// Returns:
+    /// ```text
+    /// Entry::Directories(Directories {
+    ///     extensions: ["rs"],
+    ///     include: [base],
+    ///     exclude: [base/.git, base/target],
+    /// })
+    /// ```
     pub fn local_cargo_package(base: AbsPathBuf) -> Entry {
         Entry::Directories(dirs(base, &[".git", "target"]))
     }
+
+    /// Returns:
+    /// ```text
+    /// Entry::Directories(Directories {
+    ///     extensions: ["rs"],
+    ///     include: [base],
+    ///     exclude: [base/.git, /tests, /examples, /benches],
+    /// })
+    /// ```
     pub fn cargo_package_dependency(base: AbsPathBuf) -> Entry {
         Entry::Directories(dirs(base, &[".git", "/tests", "/examples", "/benches"]))
     }
 
+    /// Returns `true` if `path` is included in `self`.
+    ///
+    /// See [`Directories::contains_file`].
     pub fn contains_file(&self, path: &AbsPath) -> bool {
         match self {
             Entry::Files(files) => files.iter().any(|it| it == path),
             Entry::Directories(dirs) => dirs.contains_file(path),
         }
     }
+
+    /// Returns `true` if `path` is included in `self`.
+    ///
+    /// - If `self` is `Entry::Files`, returns `false`
+    /// - Else, see [`Directories::contains_dir`].
     pub fn contains_dir(&self, path: &AbsPath) -> bool {
         match self {
             Entry::Files(_) => false,
@@ -72,6 +131,7 @@ impl Entry {
 }
 
 impl Directories {
+    /// Returns `true` if `path` is included in `self`.
     pub fn contains_file(&self, path: &AbsPath) -> bool {
         let ext = path.extension().unwrap_or_default();
         if self.extensions.iter().all(|it| it.as_str() != ext) {
@@ -79,9 +139,21 @@ impl Directories {
         }
         self.includes_path(path)
     }
+
+    /// Returns `true` if `path` is included in `self`.
+    ///
+    /// Since `path` is supposed to be a directory, this will not take extension
+    /// into account.
     pub fn contains_dir(&self, path: &AbsPath) -> bool {
         self.includes_path(path)
     }
+
+    /// Returns `true` if `path` is included in `self`.
+    ///
+    /// It is included if
+    ///   - An element in `self.include` is a prefix of `path`.
+    ///   - This path is longer than any element in `self.exclude` that is a prefix
+    ///     of `path`. In case of equality, exclusion wins.
     fn includes_path(&self, path: &AbsPath) -> bool {
         let mut include: Option<&AbsPathBuf> = None;
         for incl in &self.include {
@@ -105,6 +177,14 @@ impl Directories {
     }
 }
 
+/// Returns :
+/// ```text
+/// Directories {
+///     extensions: ["rs"],
+///     include: [base],
+///     exclude: [base/<exclude>],
+/// }
+/// ```
 fn dirs(base: AbsPathBuf, exclude: &[&str]) -> Directories {
     let exclude = exclude.iter().map(|it| base.join(it)).collect::<Vec<_>>();
     Directories { extensions: vec!["rs".to_string()], include: vec![base], exclude }