rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Consider crate declaration names

Browse Source
This commit is contained in:
Kirill Bulatov
2020-03-08 15:26:57 +02:00
parent 32f5276465
commit 5cffef56e2
11 changed files with 135 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
crates/rust-analyzer/src/world.rs
View File

@@ -123,13 +123,12 @@ impl WorldState {
let vfs_file = vfs.load(path);
vfs_file.map(|f| FileId(f.0))
};
for ws in workspaces.iter() {
let (graph, crate_names) = ws.to_crate_graph(&default_cfg_options, &mut load);
let shift = crate_graph.extend(graph);
for (crate_id, name) in crate_names {
change.set_debug_crate_name(crate_id.shift(shift), name)
}
}
workspaces.iter().map(|ws| ws.to_crate_graph(&default_cfg_options, &mut load)).for_each(
|graph| {
crate_graph.extend(graph);
},
);
change.set_crate_graph(crate_graph);
// FIXME: Figure out the multi-workspace situation