bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/ide/src/view_crate_graph.rs')
-rw-r--r--crates/ide/src/view_crate_graph.rs63
1 files changed, 35 insertions, 28 deletions
diff --git a/crates/ide/src/view_crate_graph.rs b/crates/ide/src/view_crate_graph.rs
index eb6eb7da1e..4696fef320 100644
--- a/crates/ide/src/view_crate_graph.rs
+++ b/crates/ide/src/view_crate_graph.rs
@@ -1,9 +1,11 @@
use dot::{Id, LabelText};
+use ide_db::base_db::salsa::plumbing::AsId;
use ide_db::{
- base_db::{CrateGraph, CrateId, Dependency, SourceDatabase, SourceRootDatabase},
- FxHashSet, RootDatabase,
+ FxHashMap, RootDatabase,
+ base_db::{
+ BuiltCrateData, BuiltDependency, Crate, ExtraCrateData, RootQueryDb, SourceDatabase,
+ },
};
-use triomphe::Arc;
// Feature: View Crate Graph
//
@@ -16,76 +18,81 @@ use triomphe::Arc;
// |---------|-------------|
// | VS Code | **rust-analyzer: View Crate Graph** |
pub(crate) fn view_crate_graph(db: &RootDatabase, full: bool) -> Result<String, String> {
- let crate_graph = db.crate_graph();
- let crates_to_render = crate_graph
+ let all_crates = db.all_crates();
+ let crates_to_render = all_crates
.iter()
- .filter(|krate| {
+ .copied()
+ .map(|krate| (krate, (krate.data(db), krate.extra_data(db))))
+ .filter(|(_, (crate_data, _))| {
if full {
true
} else {
// Only render workspace crates
- let root_id = db.file_source_root(crate_graph[*krate].root_file_id);
- !db.source_root(root_id).is_library
+ let root_id = db.file_source_root(crate_data.root_file_id).source_root_id(db);
+ !db.source_root(root_id).source_root(db).is_library
}
})
.collect();
- let graph = DotCrateGraph { graph: crate_graph, crates_to_render };
+ let graph = DotCrateGraph { crates_to_render };
let mut dot = Vec::new();
dot::render(&graph, &mut dot).unwrap();
Ok(String::from_utf8(dot).unwrap())
}
-struct DotCrateGraph {
- graph: Arc<CrateGraph>,
- crates_to_render: FxHashSet<CrateId>,
+struct DotCrateGraph<'db> {
+ crates_to_render: FxHashMap<Crate, (&'db BuiltCrateData, &'db ExtraCrateData)>,
}
-type Edge<'a> = (CrateId, &'a Dependency);
+type Edge<'a> = (Crate, &'a BuiltDependency);
-impl<'a> dot::GraphWalk<'a, CrateId, Edge<'a>> for DotCrateGraph {
- fn nodes(&'a self) -> dot::Nodes<'a, CrateId> {
- self.crates_to_render.iter().copied().collect()
+impl<'a> dot::GraphWalk<'a, Crate, Edge<'a>> for DotCrateGraph<'_> {
+ fn nodes(&'a self) -> dot::Nodes<'a, Crate> {
+ self.crates_to_render.keys().copied().collect()
}
fn edges(&'a self) -> dot::Edges<'a, Edge<'a>> {
self.crates_to_render
.iter()
- .flat_map(|krate| {
- self.graph[*krate]
+ .flat_map(|(krate, (crate_data, _))| {
+ crate_data
.dependencies
.iter()
- .filter(|dep| self.crates_to_render.contains(&dep.crate_id))
+ .filter(|dep| self.crates_to_render.contains_key(&dep.crate_id))
.map(move |dep| (*krate, dep))
})
.collect()
}
- fn source(&'a self, edge: &Edge<'a>) -> CrateId {
+ fn source(&'a self, edge: &Edge<'a>) -> Crate {
edge.0
}
- fn target(&'a self, edge: &Edge<'a>) -> CrateId {
+ fn target(&'a self, edge: &Edge<'a>) -> Crate {
edge.1.crate_id
}
}
-impl<'a> dot::Labeller<'a, CrateId, Edge<'a>> for DotCrateGraph {
+impl<'a> dot::Labeller<'a, Crate, Edge<'a>> for DotCrateGraph<'_> {
fn graph_id(&'a self) -> Id<'a> {
Id::new("rust_analyzer_crate_graph").unwrap()
}
- fn node_id(&'a self, n: &CrateId) -> Id<'a> {
- Id::new(format!("_{}", u32::from(n.into_raw()))).unwrap()
+ fn node_id(&'a self, n: &Crate) -> Id<'a> {
+ let id = n.as_id().as_u32();
+ Id::new(format!("_{:?}", id)).unwrap()
}
- fn node_shape(&'a self, _node: &CrateId) -> Option<LabelText<'a>> {
+ fn node_shape(&'a self, _node: &Crate) -> Option<LabelText<'a>> {
Some(LabelText::LabelStr("box".into()))
}
- fn node_label(&'a self, n: &CrateId) -> LabelText<'a> {
- let name =
- self.graph[*n].display_name.as_ref().map_or("(unnamed crate)", |name| name.as_str());
+ fn node_label(&'a self, n: &Crate) -> LabelText<'a> {
+ let name = self.crates_to_render[n]
+ .1
+ .display_name
+ .as_ref()
+ .map_or("(unnamed crate)", |name| name.as_str());
LabelText::LabelStr(name.into())
}
}