2 files changed, 32 insertions, 31 deletions

diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs
index cf46048e5..05f2e7b7a 100644
--- a/crates/ra_project_model/src/lib.rs
+++ b/crates/ra_project_model/src/lib.rs
@@ -7,7 +7,6 @@ mod sysroot;
 use std::{
     fs::{self, read_dir, ReadDir},
     io,
-    path::Path,
     process::{Command, Output},
 };
 
@@ -35,7 +34,7 @@ pub enum ProjectWorkspace {
 /// `PackageRoot` describes a package root folder.
 /// Which may be an external dependency, or a member of
 /// the current workspace.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash)]
 pub struct PackageRoot {
     /// Is a member of the current workspace
     pub is_member: bool,
@@ -178,14 +177,16 @@ impl ProjectWorkspace {
     pub fn to_roots(&self) -> Vec<PackageRoot> {
         match self {
             ProjectWorkspace::Json { project } => project
-                .roots
+                .crates
                 .iter()
-                .map(|r| {
-                    let path = r.path.clone();
-                    let include = vec![path];
-                    PackageRoot { is_member: true, include, exclude: Vec::new() }
+                .map(|krate| PackageRoot {
+                    is_member: krate.is_workspace_member,
+                    include: krate.include.clone(),
+                    exclude: krate.exclude.clone(),
                 })
-                .collect(),
+                .collect::<FxHashSet<_>>()
+                .into_iter()
+                .collect::<Vec<_>>(),
             ProjectWorkspace::Cargo { cargo, sysroot } => cargo
                 .packages()
                 .map(|pkg| {
@@ -505,18 +506,6 @@ impl ProjectWorkspace {
         }
         crate_graph
     }
-
-    pub fn workspace_root_for(&self, path: &Path) -> Option<&AbsPath> {
-        match self {
-            ProjectWorkspace::Cargo { cargo, .. } => {
-                Some(cargo.workspace_root()).filter(|root| path.starts_with(root))
-            }
-            ProjectWorkspace::Json { project: ProjectJson { roots, .. }, .. } => roots
-                .iter()
-                .find(|root| path.starts_with(&root.path))
-                .map(|root| root.path.as_path()),
-        }
-    }
 }
 
 fn get_rustc_cfg_options(target: Option<&str>) -> CfgOptions {
diff --git a/crates/ra_project_model/src/project_json.rs b/crates/ra_project_model/src/project_json.rs
index 778cc84ef..e0052ac6d 100644
--- a/crates/ra_project_model/src/project_json.rs
+++ b/crates/ra_project_model/src/project_json.rs
@@ -12,17 +12,9 @@ use stdx::split_delim;
 /// Roots and crates that compose this Rust project.
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct ProjectJson {
-    pub(crate) roots: Vec<Root>,
     pub(crate) crates: Vec<Crate>,
 }
 
-/// A root points to the directory which contains Rust crates. rust-analyzer watches all files in
-/// all roots. Roots might be nested.
-#[derive(Clone, Debug, Eq, PartialEq)]
-pub struct Root {
-    pub(crate) path: AbsPathBuf,
-}
-
 /// A crate points to the root module of a crate and lists the dependencies of the crate. This is
 /// useful in creating the crate graph.
 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -35,12 +27,13 @@ pub struct Crate {
     pub(crate) out_dir: Option<AbsPathBuf>,
     pub(crate) proc_macro_dylib_path: Option<AbsPathBuf>,
     pub(crate) is_workspace_member: bool,
+    pub(crate) include: Vec<AbsPathBuf>,
+    pub(crate) exclude: Vec<AbsPathBuf>,
 }
 
 impl ProjectJson {
     pub fn new(base: &AbsPath, data: ProjectJsonData) -> ProjectJson {
         ProjectJson {
-            roots: data.roots.into_iter().map(|path| Root { path: base.join(path) }).collect(),
             crates: data
                 .crates
                 .into_iter()
@@ -50,8 +43,19 @@ impl ProjectJson {
                             && !crate_data.root_module.starts_with("..")
                             || crate_data.root_module.starts_with(base)
                     });
+                    let root_module = base.join(crate_data.root_module);
+                    let (include, exclude) = match crate_data.source {
+                        Some(src) => {
+                            let absolutize = |dirs: Vec<PathBuf>| {
+                                dirs.into_iter().map(|it| base.join(it)).collect::<Vec<_>>()
+                            };
+                            (absolutize(src.include_dirs), absolutize(src.exclude_dirs))
+                        }
+                        None => (vec![root_module.parent().unwrap().to_path_buf()], Vec::new()),
+                    };
+
                     Crate {
-                        root_module: base.join(crate_data.root_module),
+                        root_module,
                         edition: crate_data.edition.into(),
                         deps: crate_data
                             .deps
@@ -79,6 +83,8 @@ impl ProjectJson {
                             .proc_macro_dylib_path
                             .map(|it| base.join(it)),
                         is_workspace_member,
+                        include,
+                        exclude,
                     }
                 })
                 .collect::<Vec<_>>(),
@@ -88,7 +94,6 @@ impl ProjectJson {
 
 #[derive(Deserialize)]
 pub struct ProjectJsonData {
-    roots: Vec<PathBuf>,
     crates: Vec<CrateData>,
 }
 
@@ -103,6 +108,7 @@ struct CrateData {
     out_dir: Option<PathBuf>,
     proc_macro_dylib_path: Option<PathBuf>,
     is_workspace_member: Option<bool>,
+    source: Option<CrateSource>,
 }
 
 #[derive(Deserialize)]
@@ -132,6 +138,12 @@ struct DepData {
     name: CrateName,
 }
 
+#[derive(Deserialize)]
+struct CrateSource {
+    include_dirs: Vec<PathBuf>,
+    exclude_dirs: Vec<PathBuf>,
+}
+
 fn deserialize_crate_name<'de, D>(de: D) -> Result<CrateName, D::Error>
 where
     D: de::Deserializer<'de>,