Revert "debugger beta: Fix bug where debug Rust main running action f… (#31743)

…ailed (#31291)"

This reverts commit aab76208b5.

Closes #31737

I cannot repro the original issue that this commit was trying to solve
anymore.

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2025-05-30 14:32:59 +02:00 committed by GitHub
parent e0fa3032ec
commit 6bb4b5fa64
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 42 deletions

View file

@ -237,18 +237,6 @@ impl TaskTemplate {
env
};
// We filter out env variables here that aren't set so we don't have extra white space in args
let args = self
.args
.iter()
.filter(|arg| {
arg.starts_with('$')
.then(|| env.get(&arg[1..]).is_some_and(|arg| !arg.trim().is_empty()))
.unwrap_or(true)
})
.cloned()
.collect();
Some(ResolvedTask {
id: id.clone(),
substituted_variables,
@ -268,7 +256,7 @@ impl TaskTemplate {
},
),
command,
args,
args: self.args.clone(),
env,
use_new_terminal: self.use_new_terminal,
allow_concurrent_runs: self.allow_concurrent_runs,
@ -715,7 +703,6 @@ mod tests {
label: "My task".into(),
command: "echo".into(),
args: vec!["$PATH".into()],
env: HashMap::from_iter([("PATH".to_owned(), "non-empty".to_owned())]),
..TaskTemplate::default()
};
let resolved_task = task
@ -728,32 +715,6 @@ mod tests {
assert_eq!(resolved.args, task.args);
}
#[test]
fn test_empty_env_variables_excluded_from_args() {
let task = TaskTemplate {
label: "My task".into(),
command: "echo".into(),
args: vec![
"$EMPTY_VAR".into(),
"hello".into(),
"$WHITESPACE_VAR".into(),
"$UNDEFINED_VAR".into(),
"$WORLD".into(),
],
env: HashMap::from_iter([
("EMPTY_VAR".to_owned(), "".to_owned()),
("WHITESPACE_VAR".to_owned(), " ".to_owned()),
("WORLD".to_owned(), "non-empty".to_owned()),
]),
..TaskTemplate::default()
};
let resolved_task = task
.resolve_task(TEST_ID_BASE, &TaskContext::default())
.unwrap();
let resolved = resolved_task.resolved;
assert_eq!(resolved.args, vec!["hello", "$WORLD"]);
}
#[test]
fn test_errors_on_missing_zed_variable() {
let task = TaskTemplate {