From 39a2bc5e3cd86876eef6f3a96bef188f88e85114 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 21 Jul 2020 12:52:51 +0200 Subject: Expose package roots more directly --- crates/ra_project_model/src/lib.rs | 62 ++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 30 deletions(-) (limited to 'crates/ra_project_model') diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index b9c5424bf..cf46048e5 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs @@ -37,28 +37,10 @@ pub enum ProjectWorkspace { /// the current workspace. #[derive(Debug, Clone)] pub struct PackageRoot { - /// Path to the root folder - path: AbsPathBuf, /// Is a member of the current workspace - is_member: bool, - out_dir: Option, -} -impl PackageRoot { - pub fn new_member(path: AbsPathBuf) -> PackageRoot { - Self { path, is_member: true, out_dir: None } - } - pub fn new_non_member(path: AbsPathBuf) -> PackageRoot { - Self { path, is_member: false, out_dir: None } - } - pub fn path(&self) -> &AbsPath { - &self.path - } - pub fn out_dir(&self) -> Option<&AbsPath> { - self.out_dir.as_deref() - } - pub fn is_member(&self) -> bool { - self.is_member - } + pub is_member: bool, + pub include: Vec, + pub exclude: Vec, } #[derive(Debug, Clone, PartialEq, Eq, Hash, Ord, PartialOrd)] @@ -195,18 +177,38 @@ impl ProjectWorkspace { /// the root is a member of the current workspace pub fn to_roots(&self) -> Vec { match self { - ProjectWorkspace::Json { project } => { - project.roots.iter().map(|r| PackageRoot::new_member(r.path.clone())).collect() - } + ProjectWorkspace::Json { project } => project + .roots + .iter() + .map(|r| { + let path = r.path.clone(); + let include = vec![path]; + PackageRoot { is_member: true, include, exclude: Vec::new() } + }) + .collect(), ProjectWorkspace::Cargo { cargo, sysroot } => cargo .packages() - .map(|pkg| PackageRoot { - path: cargo[pkg].root().to_path_buf(), - is_member: cargo[pkg].is_member, - out_dir: cargo[pkg].out_dir.clone(), + .map(|pkg| { + let is_member = cargo[pkg].is_member; + let pkg_root = cargo[pkg].root().to_path_buf(); + + let mut include = vec![pkg_root.clone()]; + include.extend(cargo[pkg].out_dir.clone()); + + let mut exclude = vec![pkg_root.join(".git")]; + if is_member { + exclude.push(pkg_root.join("target")); + } else { + exclude.push(pkg_root.join("tests")); + exclude.push(pkg_root.join("examples")); + exclude.push(pkg_root.join("benches")); + } + PackageRoot { is_member, include, exclude } }) - .chain(sysroot.crates().map(|krate| { - PackageRoot::new_non_member(sysroot[krate].root_dir().to_path_buf()) + .chain(sysroot.crates().map(|krate| PackageRoot { + is_member: false, + include: vec![sysroot[krate].root_dir().to_path_buf()], + exclude: Vec::new(), })) .collect(), } -- cgit v1.2.3 From fe87aec7b61c7cf4c62162f257655507c4fd9422 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 21 Jul 2020 14:57:20 +0200 Subject: Replace roots with include/exclude directories --- crates/ra_project_model/src/lib.rs | 29 ++++++++---------------- crates/ra_project_model/src/project_json.rs | 34 +++++++++++++++++++---------- 2 files changed, 32 insertions(+), 31 deletions(-) (limited to 'crates/ra_project_model') 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 { 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::>() + .into_iter() + .collect::>(), 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, pub(crate) crates: Vec, } -/// 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, pub(crate) proc_macro_dylib_path: Option, pub(crate) is_workspace_member: bool, + pub(crate) include: Vec, + pub(crate) exclude: Vec, } 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| { + dirs.into_iter().map(|it| base.join(it)).collect::>() + }; + (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::>(), @@ -88,7 +94,6 @@ impl ProjectJson { #[derive(Deserialize)] pub struct ProjectJsonData { - roots: Vec, crates: Vec, } @@ -103,6 +108,7 @@ struct CrateData { out_dir: Option, proc_macro_dylib_path: Option, is_workspace_member: Option, + source: Option, } #[derive(Deserialize)] @@ -132,6 +138,12 @@ struct DepData { name: CrateName, } +#[derive(Deserialize)] +struct CrateSource { + include_dirs: Vec, + exclude_dirs: Vec, +} + fn deserialize_crate_name<'de, D>(de: D) -> Result where D: de::Deserializer<'de>, -- cgit v1.2.3 From b48336bf940ce1b55e72d244ff9f28573f2e5548 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 21 Jul 2020 15:12:12 +0200 Subject: Replace OUT_DIR in project.json with general env OUT_DIR doesn't make sense here, as this is a cargo-specific concept --- crates/ra_project_model/src/lib.rs | 7 ++----- crates/ra_project_model/src/project_json.rs | 9 +++++---- 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'crates/ra_project_model') diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index 05f2e7b7a..2bb156610 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs @@ -259,11 +259,8 @@ impl ProjectWorkspace { let file_id = load(&file_path)?; let mut env = Env::default(); - if let Some(out_dir) = &krate.out_dir { - // NOTE: cargo and rustc seem to hide non-UTF-8 strings from env! and option_env!() - if let Some(out_dir) = out_dir.to_str().map(|s| s.to_owned()) { - env.set("OUT_DIR", out_dir); - } + for (k, v) in &krate.env { + env.set(k, v.clone()); } let proc_macro = krate .proc_macro_dylib_path diff --git a/crates/ra_project_model/src/project_json.rs b/crates/ra_project_model/src/project_json.rs index e0052ac6d..e9a333191 100644 --- a/crates/ra_project_model/src/project_json.rs +++ b/crates/ra_project_model/src/project_json.rs @@ -5,7 +5,7 @@ use std::path::PathBuf; use paths::{AbsPath, AbsPathBuf}; use ra_cfg::CfgOptions; use ra_db::{CrateId, CrateName, Dependency, Edition}; -use rustc_hash::FxHashSet; +use rustc_hash::{FxHashMap, FxHashSet}; use serde::{de, Deserialize}; use stdx::split_delim; @@ -24,7 +24,7 @@ pub struct Crate { pub(crate) deps: Vec, pub(crate) cfg: CfgOptions, pub(crate) target: Option, - pub(crate) out_dir: Option, + pub(crate) env: FxHashMap, pub(crate) proc_macro_dylib_path: Option, pub(crate) is_workspace_member: bool, pub(crate) include: Vec, @@ -78,7 +78,7 @@ impl ProjectJson { cfg }, target: crate_data.target, - out_dir: crate_data.out_dir.map(|it| base.join(it)), + env: crate_data.env, proc_macro_dylib_path: crate_data .proc_macro_dylib_path .map(|it| base.join(it)), @@ -105,7 +105,8 @@ struct CrateData { #[serde(default)] cfg: FxHashSet, target: Option, - out_dir: Option, + #[serde(default)] + env: FxHashMap, proc_macro_dylib_path: Option, is_workspace_member: Option, source: Option, -- cgit v1.2.3 From b68ef1231daf6eb1abeb06a30dc89af1254b833d Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 21 Jul 2020 17:17:21 +0200 Subject: More Rustic API for Env --- crates/ra_project_model/src/lib.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'crates/ra_project_model') diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index 2bb156610..6da4d7928 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs @@ -258,10 +258,7 @@ impl ProjectWorkspace { let file_path = &krate.root_module; let file_id = load(&file_path)?; - let mut env = Env::default(); - for (k, v) in &krate.env { - env.set(k, v.clone()); - } + let env = krate.env.clone().into_iter().collect(); let proc_macro = krate .proc_macro_dylib_path .clone() -- cgit v1.2.3