Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-25 12:33:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #5563

Browse source 
5563: Check all targets for package-level tasks r=matklad a=SomeoneToIgnore

When invoking "Select Runnable" with the caret on a runnable with a specific target (test, bench, binary), append the corresponding argument for the `cargo check -p` module runnable.

Co-authored-by: Kirill Bulatov <mail4score@gmail.com>
This commit is contained in:
bors[bot] 2020-07-29 21:51:49 +00:00 committed by GitHub
commit bd5d236724
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -469,12 +469,12 @@ pub(crate) fn handle_runnables(
res.push(runnable);
}
// Add `cargo check` and `cargo test` for the whole package
// Add `cargo check` and `cargo test` for all targets of the whole package
match cargo_spec {
Some(spec) => {
for &cmd in ["check", "test"].iter() {
res.push(lsp_ext::Runnable {
label: format!("cargo {} -p {}", cmd, spec.package),
label: format!("cargo {} -p {} --all-targets", cmd, spec.package),
location: None,
kind: lsp_ext::RunnableKind::Cargo,
args: lsp_ext::CargoRunnable {
@ -483,6 +483,7 @@ pub(crate) fn handle_runnables(
cmd.to_string(),
"--package".to_string(),
spec.package.clone(),
"--all-targets".to_string(),
],
executable_args: Vec::new(),
expect_test: None,

8
crates/rust-analyzer/tests/heavy_tests/main.rs
View file

@ -115,21 +115,21 @@ fn main() {}
},
{
"args": {
"cargoArgs": ["check", "--package", "foo"],
"cargoArgs": ["check", "--package", "foo", "--all-targets"],
"executableArgs": [],
"workspaceRoot": server.path().join("foo")
},
"kind": "cargo",
"label": "cargo check -p foo"
"label": "cargo check -p foo --all-targets"
},
{
"args": {
"cargoArgs": ["test", "--package", "foo"],
"cargoArgs": ["test", "--package", "foo", "--all-targets"],
"executableArgs": [],
"workspaceRoot": server.path().join("foo")
},
"kind": "cargo",
"label": "cargo test -p foo"
"label": "cargo test -p foo --all-targets"
}
]),
);