debugger: Allow locators to generate full debug scenarios (#30014)

Closes #ISSUE

Release Notes:

- N/A

---------

Co-authored-by: Anthony <anthony@zed.dev>
Co-authored-by: Remco Smits <djsmits12@gmail.com>
This commit is contained in:
Piotr Osiewicz
2025-05-06 18:39:49 +02:00
committed by GitHub
co-authored by Anthony Remco Smits
parent a378b3f300
commit bbfcd885ab
9 changed files with 197 additions and 146 deletions
+57 -15
View File
@@ -1,12 +1,13 @@
use anyhow::{Result, anyhow};
use async_trait::async_trait;
use dap::{DapLocator, DebugRequest};
use gpui::SharedString;
use serde_json::Value;
use smol::{
io::AsyncReadExt,
process::{Command, Stdio},
};
use task::SpawnInTerminal;
use task::{BuildTaskDefinition, DebugScenario, ShellBuilder, SpawnInTerminal, TaskTemplate};
pub(crate) struct CargoLocator;
@@ -37,18 +38,51 @@ async fn find_best_executable(executables: &[String], test_name: &str) -> Option
}
#[async_trait]
impl DapLocator for CargoLocator {
fn accepts(&self, build_config: &SpawnInTerminal) -> bool {
fn name(&self) -> SharedString {
SharedString::new_static("rust-cargo-locator")
}
fn create_scenario(&self, build_config: &TaskTemplate, adapter: &str) -> Option<DebugScenario> {
if build_config.command != "cargo" {
return false;
return None;
}
let Some(command) = build_config.args.first().map(|s| s.as_str()) else {
return false;
};
if matches!(command, "check" | "run") {
return false;
let mut task_template = build_config.clone();
let cargo_action = task_template.args.first_mut()?;
if cargo_action == "check" {
return None;
}
!matches!(command, "test" | "bench")
|| build_config.args.iter().any(|arg| arg == "--no-run")
match cargo_action.as_ref() {
"run" => {
*cargo_action = "build".to_owned();
}
"test" | "bench" => {
let delimiter = task_template
.args
.iter()
.position(|arg| arg == "--")
.unwrap_or(task_template.args.len());
if !task_template.args[..delimiter]
.iter()
.any(|arg| arg == "--no-run")
{
task_template.args.insert(delimiter, "--no-run".to_owned());
}
}
_ => {}
}
let label = format!("Debug `{}`", build_config.label);
Some(DebugScenario {
adapter: adapter.to_owned().into(),
label: SharedString::from(label),
build: Some(BuildTaskDefinition::Template {
task_template,
locator_name: Some(self.name()),
}),
request: None,
initialize_args: None,
tcp_connection: None,
stop_on_entry: None,
})
}
async fn run(&self, build_config: SpawnInTerminal) -> Result<DebugRequest> {
@@ -57,10 +91,19 @@ impl DapLocator for CargoLocator {
"Couldn't get cwd from debug config which is needed for locators"
));
};
let mut child = Command::new("cargo")
.args(&build_config.args)
.arg("--message-format=json")
let builder = ShellBuilder::new(true, &build_config.shell).non_interactive();
let (program, args) = builder.build(
"cargo".into(),
&build_config
.args
.iter()
.cloned()
.take_while(|arg| arg != "--")
.chain(Some("--message-format=json".to_owned()))
.collect(),
);
let mut child = Command::new(program)
.args(args)
.envs(build_config.env.iter().map(|(k, v)| (k.clone(), v.clone())))
.current_dir(cwd)
.stdout(Stdio::piped())
@@ -89,7 +132,6 @@ impl DapLocator for CargoLocator {
if executables.is_empty() {
return Err(anyhow!("Couldn't get executable in cargo locator"));
};
let is_test = build_config.args.first().map_or(false, |arg| arg == "test");
let mut test_name = None;