Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-11-15 09:27:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move dot invocation to rust-analyzer crate

Browse source
This commit is contained in:
Jonas Schievink 2021-05-12 00:14:59 +02:00
parent a328a6bc75
commit 23cd6d0d56
3 changed files with 19 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/ide/src/lib.rs
View file

@ -288,6 +288,7 @@ impl Analysis {
self.with_db(|db| view_hir::view_hir(&db, position))
}
/// Renders the crate graph to GraphViz "dot" syntax.
pub fn view_crate_graph(&self) -> Cancelable<Result<String, String>> {
self.with_db(|db| view_crate_graph::view_crate_graph(&db))
}

25
crates/ide/src/view_crate_graph.rs
View file

@ -1,9 +1,4 @@
use std::{
error::Error,
io::{Read, Write},
process::{Command, Stdio},
sync::Arc,
};
use std::sync::Arc;
use dot::{Id, LabelText};
use ide_db::{
@ -38,23 +33,7 @@ pub(crate) fn view_crate_graph(db: &RootDatabase) -> Result<String, String> {
let mut dot = Vec::new();
dot::render(&graph, &mut dot).unwrap();
render_svg(&dot).map_err(|e| e.to_string())
}
fn render_svg(dot: &[u8]) -> Result<String, Box<dyn Error>> {
// We shell out to `dot` to render to SVG, as there does not seem to be a pure-Rust renderer.
let child = Command::new("dot")
.arg("-Tsvg")
.stdin(Stdio::piped())
.stdout(Stdio::piped())
.spawn()
.map_err(|err| format!("failed to spawn `dot`: {}", err))?;
child.stdin.unwrap().write_all(&dot)?;
let mut svg = String::new();
child.stdout.unwrap().read_to_string(&mut svg)?;
Ok(svg)
Ok(String::from_utf8(dot).unwrap())
}
struct DotCrateGraph {

20
crates/rust-analyzer/src/handlers.rs
View file

@ -3,8 +3,8 @@
//! `ide` crate.
use std::{
io::Write as _,
process::{self, Stdio},
io::{Read, Write as _},
process::{self, Command, Stdio},
};
use ide::{
@ -119,8 +119,20 @@ pub(crate) fn handle_view_hir(
pub(crate) fn handle_view_crate_graph(snap: GlobalStateSnapshot, (): ()) -> Result<String> {
let _p = profile::span("handle_view_crate_graph");
let res = snap.analysis.view_crate_graph()??;
Ok(res)
let dot = snap.analysis.view_crate_graph()??;
// We shell out to `dot` to render to SVG, as there does not seem to be a pure-Rust renderer.
let child = Command::new("dot")
.arg("-Tsvg")
.stdin(Stdio::piped())
.stdout(Stdio::piped())
.spawn()
.map_err(|err| format!("failed to spawn `dot`: {}", err))?;
child.stdin.unwrap().write_all(dot.as_bytes())?;
let mut svg = String::new();
child.stdout.unwrap().read_to_string(&mut svg)?;
Ok(svg)
}
pub(crate) fn handle_expand_macro(