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

Merge #4362

Browse source 
4362: do not show runnables for main function outside of a binary target  r=matklad a=bnjjj

close #4356

Co-authored-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com>
This commit is contained in:
bors[bot] 2020-05-07 17:30:13 +00:00 committed by GitHub
commit 97b9b364d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
crates/rust-analyzer/src/main_loop/handlers.rs
View file

@ -42,6 +42,7 @@ use crate::{
world::WorldSnapshot, world::WorldSnapshot,
LspError, Result, LspError, Result,
}; };
use ra_project_model::TargetKind;
pub fn handle_analyzer_status(world: WorldSnapshot, _: ()) -> Result<String> { pub fn handle_analyzer_status(world: WorldSnapshot, _: ()) -> Result<String> {
let _p = profile("handle_analyzer_status"); let _p = profile("handle_analyzer_status");
@ -384,16 +385,27 @@ pub fn handle_runnables(
let offset = params.position.map(|it| it.conv_with(&line_index)); let offset = params.position.map(|it| it.conv_with(&line_index));
let mut res = Vec::new(); let mut res = Vec::new();
let workspace_root = world.workspace_root_for(file_id); let workspace_root = world.workspace_root_for(file_id);
let cargo_spec = CargoTargetSpec::for_file(&world, file_id)?;
for runnable in world.analysis().runnables(file_id)? { for runnable in world.analysis().runnables(file_id)? {
if let Some(offset) = offset { if let Some(offset) = offset {
if !runnable.range.contains_inclusive(offset) { if !runnable.range.contains_inclusive(offset) {
continue; continue;
} }
} }
// Do not suggest binary run on other target than binary
if let RunnableKind::Bin = runnable.kind {
if let Some(spec) = &cargo_spec {
match spec.target_kind {
TargetKind::Bin => {}
_ => continue,
}
}
}
res.push(to_lsp_runnable(&world, file_id, runnable)?); res.push(to_lsp_runnable(&world, file_id, runnable)?);
} }
// Add `cargo check` and `cargo test` for the whole package // Add `cargo check` and `cargo test` for the whole package
match CargoTargetSpec::for_file(&world, file_id)? { match cargo_spec {
Some(spec) => { Some(spec) => {
for &cmd in ["check", "test"].iter() { for &cmd in ["check", "test"].iter() {
res.push(req::Runnable { res.push(req::Runnable {
@ -831,13 +843,23 @@ pub fn handle_code_lens(
let mut lenses: Vec<CodeLens> = Default::default(); let mut lenses: Vec<CodeLens> = Default::default();
let cargo_spec = CargoTargetSpec::for_file(&world, file_id)?;
// Gather runnables // Gather runnables
for runnable in world.analysis().runnables(file_id)? { for runnable in world.analysis().runnables(file_id)? {
let title = match &runnable.kind { let title = match &runnable.kind {
RunnableKind::Test { .. } | RunnableKind::TestMod { .. } => "▶️\u{fe0e}Run Test", RunnableKind::Test { .. } | RunnableKind::TestMod { .. } => "▶️\u{fe0e}Run Test",
RunnableKind::DocTest { .. } => "▶️\u{fe0e}Run Doctest", RunnableKind::DocTest { .. } => "▶️\u{fe0e}Run Doctest",
RunnableKind::Bench { .. } => "Run Bench", RunnableKind::Bench { .. } => "Run Bench",
RunnableKind::Bin => "Run", RunnableKind::Bin => {
// Do not suggest binary run on other target than binary
match &cargo_spec {
Some(spec) => match spec.target_kind {
TargetKind::Bin => "Run",
_ => continue,
},
None => continue,
}
}
} }
.to_string(); .to_string();
let mut r = to_lsp_runnable(&world, file_id, runnable)?; let mut r = to_lsp_runnable(&world, file_id, runnable)?;