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

feat: add debug code lens

Browse Source 
Refs #3539
This commit is contained in:
Hannes De Valkeneer
2020-03-09 22:06:45 +01:00
parent 05b4fc6d79
commit e903fd0d97
8 changed files with 77 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
crates/rust-analyzer/src/cargo_target_spec.rs
View File

@@ -19,50 +19,48 @@ impl CargoTargetSpec {
pub(crate) fn runnable_args(
spec: Option<CargoTargetSpec>,
kind: &RunnableKind,
) -> Result<Vec<String>> {
let mut res = Vec::new();
) -> Result<(Vec<String>, Vec<String>)> {
let mut args = Vec::new();
let mut extra_args = Vec::new();
match kind {
RunnableKind::Test { test_id } => {
res.push("test".to_string());
args.push("test".to_string());
if let Some(spec) = spec {
spec.push_to(&mut res);
spec.push_to(&mut args);
}
res.push("--".to_string());
res.push(test_id.to_string());
extra_args.push(test_id.to_string());
if let TestId::Path(_) = test_id {
res.push("--exact".to_string());
extra_args.push("--exact".to_string());
}
res.push("--nocapture".to_string());
extra_args.push("--nocapture".to_string());
}
RunnableKind::TestMod { path } => {
res.push("test".to_string());
args.push("test".to_string());
if let Some(spec) = spec {
spec.push_to(&mut res);
spec.push_to(&mut args);
}
res.push("--".to_string());
res.push(path.to_string());
res.push("--nocapture".to_string());
extra_args.push(path.to_string());
extra_args.push("--nocapture".to_string());
}
RunnableKind::Bench { test_id } => {
res.push("bench".to_string());
args.push("bench".to_string());
if let Some(spec) = spec {
spec.push_to(&mut res);
spec.push_to(&mut args);
}
res.push("--".to_string());
res.push(test_id.to_string());
extra_args.push(test_id.to_string());
if let TestId::Path(_) = test_id {
res.push("--exact".to_string());
extra_args.push("--exact".to_string());
}
res.push("--nocapture".to_string());
extra_args.push("--nocapture".to_string());
}
RunnableKind::Bin => {
res.push("run".to_string());
args.push("run".to_string());
if let Some(spec) = spec {
spec.push_to(&mut res);
spec.push_to(&mut args);
}
}
}
Ok(res)
Ok((args, extra_args))
}
pub(crate) fn for_file(