language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add new_source_root meta to test fixtures

Browse source
This commit is contained in:
Lukas Wirth 2021-03-16 15:28:02 +01:00
parent e97cd709cd
commit 75fafd6fcc
3 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/base_db/src/fixture.rs
View file

@ -57,7 +57,7 @@
//! fn insert_source_code_here() {}
//! "
//! ```
use std::{str::FromStr, sync::Arc};
use std::{mem, str::FromStr, sync::Arc};
use cfg::CfgOptions;
use rustc_hash::FxHashMap;
@ -148,6 +148,7 @@ impl ChangeFixture {
let mut file_set = FileSet::default();
let source_root_prefix = "/".to_string();
let mut file_id = FileId(0);
let mut roots = Vec::new();
let mut file_position = None;
@ -168,6 +169,10 @@ impl ChangeFixture {
let meta = FileMeta::from(entry);
assert!(meta.path.starts_with(&source_root_prefix));
if meta.introduce_new_source_root {
roots.push(SourceRoot::new_local(mem::take(&mut file_set)));
}
if let Some(krate) = meta.krate {
let crate_name = CrateName::normalize_dashes(&krate);
let crate_id = crate_graph.add_crate_root(
@ -215,7 +220,8 @@ impl ChangeFixture {
}
}
change.set_roots(vec![SourceRoot::new_local(file_set)]);
roots.push(SourceRoot::new_local(mem::take(&mut file_set)));
change.set_roots(roots);
change.set_crate_graph(crate_graph);
ChangeFixture { file_position, files, change }
@ -229,6 +235,7 @@ struct FileMeta {
cfg: CfgOptions,
edition: Edition,
env: Env,
introduce_new_source_root: bool,
}
impl From<Fixture> for FileMeta {
@ -247,6 +254,7 @@ impl From<Fixture> for FileMeta {
.as_ref()
.map_or(Edition::Edition2018, |v| Edition::from_str(&v).unwrap()),
env: f.env.into_iter().collect(),
introduce_new_source_root: f.introduce_new_source_root,
}
}
}