language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Complete editable private items

Browse source
This commit is contained in:
Jonas Schievink 2021-07-23 19:57:16 +02:00
parent 75d7da196f
commit 3efdf6861f
6 changed files with 107 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,6 +92,7 @@ impl ChangeFixture {
let mut default_cfg = CfgOptions::default();
let mut file_set = FileSet::default();
let mut current_source_root_kind = SourceRootKind::Local;
let source_root_prefix = "/".to_string();
let mut file_id = FileId(0);
let mut roots = Vec::new();
@ -118,8 +119,13 @@ impl ChangeFixture {
assert!(meta.krate.is_some(), "can't specify deps without naming the crate")
}
if meta.introduce_new_source_root {
roots.push(SourceRoot::new_local(mem::take(&mut file_set)));
if let Some(kind) = &meta.introduce_new_source_root {
let root = match current_source_root_kind {
SourceRootKind::Local => SourceRoot::new_local(mem::take(&mut file_set)),
SourceRootKind::Library => SourceRoot::new_library(mem::take(&mut file_set)),
};
roots.push(root);
current_source_root_kind = *kind;
}
if let Some(krate) = meta.krate {
@ -197,7 +203,11 @@ impl ChangeFixture {
crate_graph.add_dep(krate, CrateName::new("core").unwrap(), core_crate).unwrap();
}
}
roots.push(SourceRoot::new_local(mem::take(&mut file_set)));
let root = match current_source_root_kind {
SourceRootKind::Local => SourceRoot::new_local(mem::take(&mut file_set)),
SourceRootKind::Library => SourceRoot::new_library(mem::take(&mut file_set)),
};
roots.push(root);
change.set_roots(roots);
change.set_crate_graph(crate_graph);
@ -205,6 +215,12 @@ impl ChangeFixture {
}
}
#[derive(Debug, Clone, Copy)]
enum SourceRootKind {
Local,
Library,
}
#[derive(Debug)]
struct FileMeta {
path: String,
@ -213,7 +229,7 @@ struct FileMeta {
cfg: CfgOptions,
edition: Edition,
env: Env,
introduce_new_source_root: bool,
introduce_new_source_root: Option<SourceRootKind>,
}
impl From<Fixture> for FileMeta {
@ -229,7 +245,11 @@ impl From<Fixture> for FileMeta {
cfg,
edition: f.edition.as_ref().map_or(Edition::CURRENT, |v| Edition::from_str(v).unwrap()),
env: f.env.into_iter().collect(),
introduce_new_source_root: f.introduce_new_source_root,
introduce_new_source_root: f.introduce_new_source_root.map(|kind| match &*kind {
"local" => SourceRootKind::Local,
"library" => SourceRootKind::Library,
invalid => panic!("invalid source root kind '{}'", invalid),
}),
}
}
}