diff options
Diffstat (limited to 'crates/ra_project_model/src/lib.rs')
-rw-r--r-- | crates/ra_project_model/src/lib.rs | 77 |
1 files changed, 27 insertions, 50 deletions
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index 7e8e00df8..8b85b4831 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs | |||
@@ -5,8 +5,8 @@ mod project_json; | |||
5 | mod sysroot; | 5 | mod sysroot; |
6 | 6 | ||
7 | use std::{ | 7 | use std::{ |
8 | fs::{read_dir, File, ReadDir}, | 8 | fs::{self, read_dir, ReadDir}, |
9 | io::{self, BufReader}, | 9 | io, |
10 | path::Path, | 10 | path::Path, |
11 | process::{Command, Output}, | 11 | process::{Command, Output}, |
12 | }; | 12 | }; |
@@ -14,13 +14,12 @@ use std::{ | |||
14 | use anyhow::{bail, Context, Result}; | 14 | use anyhow::{bail, Context, Result}; |
15 | use paths::{AbsPath, AbsPathBuf}; | 15 | use paths::{AbsPath, AbsPathBuf}; |
16 | use ra_cfg::CfgOptions; | 16 | use ra_cfg::CfgOptions; |
17 | use ra_db::{CrateGraph, CrateName, Edition, Env, FileId}; | 17 | use ra_db::{CrateGraph, CrateId, CrateName, Edition, Env, FileId}; |
18 | use rustc_hash::{FxHashMap, FxHashSet}; | 18 | use rustc_hash::{FxHashMap, FxHashSet}; |
19 | use serde_json::from_reader; | ||
20 | 19 | ||
21 | pub use crate::{ | 20 | pub use crate::{ |
22 | cargo_workspace::{CargoConfig, CargoWorkspace, Package, Target, TargetKind}, | 21 | cargo_workspace::{CargoConfig, CargoWorkspace, Package, Target, TargetKind}, |
23 | project_json::ProjectJson, | 22 | project_json::{ProjectJson, ProjectJsonData}, |
24 | sysroot::Sysroot, | 23 | sysroot::Sysroot, |
25 | }; | 24 | }; |
26 | pub use ra_proc_macro::ProcMacroClient; | 25 | pub use ra_proc_macro::ProcMacroClient; |
@@ -30,7 +29,7 @@ pub enum ProjectWorkspace { | |||
30 | /// Project workspace was discovered by running `cargo metadata` and `rustc --print sysroot`. | 29 | /// Project workspace was discovered by running `cargo metadata` and `rustc --print sysroot`. |
31 | Cargo { cargo: CargoWorkspace, sysroot: Sysroot }, | 30 | Cargo { cargo: CargoWorkspace, sysroot: Sysroot }, |
32 | /// Project workspace was manually specified using a `rust-project.json` file. | 31 | /// Project workspace was manually specified using a `rust-project.json` file. |
33 | Json { project: ProjectJson, project_location: AbsPathBuf }, | 32 | Json { project: ProjectJson }, |
34 | } | 33 | } |
35 | 34 | ||
36 | /// `PackageRoot` describes a package root folder. | 35 | /// `PackageRoot` describes a package root folder. |
@@ -156,17 +155,15 @@ impl ProjectWorkspace { | |||
156 | ) -> Result<ProjectWorkspace> { | 155 | ) -> Result<ProjectWorkspace> { |
157 | let res = match manifest { | 156 | let res = match manifest { |
158 | ProjectManifest::ProjectJson(project_json) => { | 157 | ProjectManifest::ProjectJson(project_json) => { |
159 | let file = File::open(&project_json).with_context(|| { | 158 | let file = fs::read_to_string(&project_json).with_context(|| { |
160 | format!("Failed to open json file {}", project_json.display()) | 159 | format!("Failed to read json file {}", project_json.display()) |
160 | })?; | ||
161 | let data = serde_json::from_str(&file).with_context(|| { | ||
162 | format!("Failed to deserialize json file {}", project_json.display()) | ||
161 | })?; | 163 | })?; |
162 | let reader = BufReader::new(file); | ||
163 | let project_location = project_json.parent().unwrap().to_path_buf(); | 164 | let project_location = project_json.parent().unwrap().to_path_buf(); |
164 | ProjectWorkspace::Json { | 165 | let project = ProjectJson::new(&project_location, data); |
165 | project: from_reader(reader).with_context(|| { | 166 | ProjectWorkspace::Json { project } |
166 | format!("Failed to deserialize json file {}", project_json.display()) | ||
167 | })?, | ||
168 | project_location, | ||
169 | } | ||
170 | } | 167 | } |
171 | ProjectManifest::CargoToml(cargo_toml) => { | 168 | ProjectManifest::CargoToml(cargo_toml) => { |
172 | let cargo = CargoWorkspace::from_cargo_metadata(&cargo_toml, cargo_features) | 169 | let cargo = CargoWorkspace::from_cargo_metadata(&cargo_toml, cargo_features) |
@@ -198,11 +195,9 @@ impl ProjectWorkspace { | |||
198 | /// the root is a member of the current workspace | 195 | /// the root is a member of the current workspace |
199 | pub fn to_roots(&self) -> Vec<PackageRoot> { | 196 | pub fn to_roots(&self) -> Vec<PackageRoot> { |
200 | match self { | 197 | match self { |
201 | ProjectWorkspace::Json { project, project_location } => project | 198 | ProjectWorkspace::Json { project } => { |
202 | .roots | 199 | project.roots.iter().map(|r| PackageRoot::new_member(r.path.clone())).collect() |
203 | .iter() | 200 | } |
204 | .map(|r| PackageRoot::new_member(project_location.join(&r.path))) | ||
205 | .collect(), | ||
206 | ProjectWorkspace::Cargo { cargo, sysroot } => cargo | 201 | ProjectWorkspace::Cargo { cargo, sysroot } => cargo |
207 | .packages() | 202 | .packages() |
208 | .map(|pkg| PackageRoot { | 203 | .map(|pkg| PackageRoot { |
@@ -219,11 +214,11 @@ impl ProjectWorkspace { | |||
219 | 214 | ||
220 | pub fn proc_macro_dylib_paths(&self) -> Vec<AbsPathBuf> { | 215 | pub fn proc_macro_dylib_paths(&self) -> Vec<AbsPathBuf> { |
221 | match self { | 216 | match self { |
222 | ProjectWorkspace::Json { project, project_location } => project | 217 | ProjectWorkspace::Json { project } => project |
223 | .crates | 218 | .crates |
224 | .iter() | 219 | .iter() |
225 | .filter_map(|krate| krate.proc_macro_dylib_path.as_ref()) | 220 | .filter_map(|krate| krate.proc_macro_dylib_path.as_ref()) |
226 | .map(|it| project_location.join(it)) | 221 | .cloned() |
227 | .collect(), | 222 | .collect(), |
228 | ProjectWorkspace::Cargo { cargo, sysroot: _sysroot } => cargo | 223 | ProjectWorkspace::Cargo { cargo, sysroot: _sysroot } => cargo |
229 | .packages() | 224 | .packages() |
@@ -246,36 +241,18 @@ impl ProjectWorkspace { | |||
246 | &self, | 241 | &self, |
247 | target: Option<&str>, | 242 | target: Option<&str>, |
248 | proc_macro_client: &ProcMacroClient, | 243 | proc_macro_client: &ProcMacroClient, |
249 | load: &mut dyn FnMut(&Path) -> Option<FileId>, | 244 | load: &mut dyn FnMut(&AbsPath) -> Option<FileId>, |
250 | ) -> CrateGraph { | 245 | ) -> CrateGraph { |
251 | let mut crate_graph = CrateGraph::default(); | 246 | let mut crate_graph = CrateGraph::default(); |
252 | match self { | 247 | match self { |
253 | ProjectWorkspace::Json { project, project_location } => { | 248 | ProjectWorkspace::Json { project } => { |
254 | let crates: FxHashMap<_, _> = project | 249 | let crates: FxHashMap<_, _> = project |
255 | .crates | 250 | .crates |
256 | .iter() | 251 | .iter() |
257 | .enumerate() | 252 | .enumerate() |
258 | .filter_map(|(seq_index, krate)| { | 253 | .filter_map(|(seq_index, krate)| { |
259 | let file_path = project_location.join(&krate.root_module); | 254 | let file_path = &krate.root_module; |
260 | let file_id = load(&file_path)?; | 255 | let file_id = load(&file_path)?; |
261 | let edition = match krate.edition { | ||
262 | project_json::Edition::Edition2015 => Edition::Edition2015, | ||
263 | project_json::Edition::Edition2018 => Edition::Edition2018, | ||
264 | }; | ||
265 | let cfg_options = { | ||
266 | let mut opts = CfgOptions::default(); | ||
267 | for cfg in &krate.cfg { | ||
268 | match cfg.find('=') { | ||
269 | None => opts.insert_atom(cfg.into()), | ||
270 | Some(pos) => { | ||
271 | let key = &cfg[..pos]; | ||
272 | let value = cfg[pos + 1..].trim_matches('"'); | ||
273 | opts.insert_key_value(key.into(), value.into()); | ||
274 | } | ||
275 | } | ||
276 | } | ||
277 | opts | ||
278 | }; | ||
279 | 256 | ||
280 | let mut env = Env::default(); | 257 | let mut env = Env::default(); |
281 | if let Some(out_dir) = &krate.out_dir { | 258 | if let Some(out_dir) = &krate.out_dir { |
@@ -290,13 +267,13 @@ impl ProjectWorkspace { | |||
290 | .map(|it| proc_macro_client.by_dylib_path(&it)); | 267 | .map(|it| proc_macro_client.by_dylib_path(&it)); |
291 | // FIXME: No crate name in json definition such that we cannot add OUT_DIR to env | 268 | // FIXME: No crate name in json definition such that we cannot add OUT_DIR to env |
292 | Some(( | 269 | Some(( |
293 | project_json::CrateId(seq_index), | 270 | CrateId(seq_index as u32), |
294 | crate_graph.add_crate_root( | 271 | crate_graph.add_crate_root( |
295 | file_id, | 272 | file_id, |
296 | edition, | 273 | krate.edition, |
297 | // FIXME json definitions can store the crate name | 274 | // FIXME json definitions can store the crate name |
298 | None, | 275 | None, |
299 | cfg_options, | 276 | krate.cfg.clone(), |
300 | env, | 277 | env, |
301 | proc_macro.unwrap_or_default(), | 278 | proc_macro.unwrap_or_default(), |
302 | ), | 279 | ), |
@@ -306,8 +283,8 @@ impl ProjectWorkspace { | |||
306 | 283 | ||
307 | for (id, krate) in project.crates.iter().enumerate() { | 284 | for (id, krate) in project.crates.iter().enumerate() { |
308 | for dep in &krate.deps { | 285 | for dep in &krate.deps { |
309 | let from_crate_id = project_json::CrateId(id); | 286 | let from_crate_id = CrateId(id as u32); |
310 | let to_crate_id = dep.krate; | 287 | let to_crate_id = dep.crate_id; |
311 | if let (Some(&from), Some(&to)) = | 288 | if let (Some(&from), Some(&to)) = |
312 | (crates.get(&from_crate_id), crates.get(&to_crate_id)) | 289 | (crates.get(&from_crate_id), crates.get(&to_crate_id)) |
313 | { | 290 | { |
@@ -523,7 +500,7 @@ impl ProjectWorkspace { | |||
523 | crate_graph | 500 | crate_graph |
524 | } | 501 | } |
525 | 502 | ||
526 | pub fn workspace_root_for(&self, path: &Path) -> Option<&Path> { | 503 | pub fn workspace_root_for(&self, path: &Path) -> Option<&AbsPath> { |
527 | match self { | 504 | match self { |
528 | ProjectWorkspace::Cargo { cargo, .. } => { | 505 | ProjectWorkspace::Cargo { cargo, .. } => { |
529 | Some(cargo.workspace_root()).filter(|root| path.starts_with(root)) | 506 | Some(cargo.workspace_root()).filter(|root| path.starts_with(root)) |
@@ -531,7 +508,7 @@ impl ProjectWorkspace { | |||
531 | ProjectWorkspace::Json { project: ProjectJson { roots, .. }, .. } => roots | 508 | ProjectWorkspace::Json { project: ProjectJson { roots, .. }, .. } => roots |
532 | .iter() | 509 | .iter() |
533 | .find(|root| path.starts_with(&root.path)) | 510 | .find(|root| path.starts_with(&root.path)) |
534 | .map(|root| root.path.as_ref()), | 511 | .map(|root| root.path.as_path()), |
535 | } | 512 | } |
536 | } | 513 | } |
537 | } | 514 | } |