Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rerun debug scenario now uses latest definition from JSON (#32569)

Browse source 
Co-authored-by: Piotr Osiewicz <piotr@zed.dev>

Closes #ISSUE

Release Notes:

- debugger: Re-running a debug scenario that has been edited on disk now
uses the latest version

Co-authored-by: Piotr Osiewicz <peterosiewicz@gmail.com>
This commit is contained in:
Conrad Irwin 2025-06-11 12:39:37 -06:00 • committed by GitHub
parent 83eb6ffe1e
commit e8ba8bb1eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 126 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

131
crates/project/src/task_inventory.rs
View file

@ -720,20 +720,37 @@ impl Inventory {
}
};
let new_templates = raw_tasks.into_iter().filter_map(|raw_template| {
serde_json::from_value::<DebugScenario>(raw_template).log_err()
});
let new_templates = raw_tasks
.into_iter()
.filter_map(|raw_template| {
serde_json::from_value::<DebugScenario>(raw_template).log_err()
})
.collect::<Vec<_>>();
let parsed_scenarios = &mut self.scenarios_from_settings;
let mut new_definitions: HashMap<_, _> = new_templates
.iter()
.map(|template| (template.label.clone(), template.clone()))
.collect();
let previously_existing_scenarios;
match location {
TaskSettingsLocation::Global(path) => {
previously_existing_scenarios = parsed_scenarios
.global_scenarios()
.map(|(_, scenario)| scenario.label.clone())
.collect::<HashSet<_>>();
parsed_scenarios
.global
.entry(path.to_owned())
.insert_entry(new_templates.collect());
.insert_entry(new_templates);
}
TaskSettingsLocation::Worktree(location) => {
let new_templates = new_templates.collect::<Vec<_>>();
previously_existing_scenarios = parsed_scenarios
.worktree_scenarios(location.worktree_id)
.map(|(_, scenario)| scenario.label.clone())
.collect::<HashSet<_>>();
if new_templates.is_empty() {
if let Some(worktree_tasks) =
parsed_scenarios.worktree.get_mut(&location.worktree_id)
@ -749,6 +766,17 @@ impl Inventory {
}
}
}
self.last_scheduled_scenarios.retain_mut(|scenario| {
if !previously_existing_scenarios.contains(&scenario.label) {
return true;
}
if let Some(new_definition) = new_definitions.remove(&scenario.label) {
*scenario = new_definition;
true
} else {
false
}
});
Ok(())
}
@ -1243,6 +1271,99 @@ mod tests {
);
}
#[gpui::test]
async fn test_reloading_debug_scenarios(cx: &mut TestAppContext) {
init_test(cx);
let fs = FakeFs::new(cx.executor());
let inventory = cx.update(|cx| Inventory::new(fs, cx));
inventory.update(cx, |inventory, cx| {
inventory
.update_file_based_scenarios(
TaskSettingsLocation::Global(Path::new("")),
Some(
r#"
[{
"label": "test scenario",
"adapter": "CodeLLDB",
"request": "launch",
"program": "wowzer",
}]
"#,
),
)
.unwrap();
let (_, scenario) = inventory
.list_debug_scenarios(&TaskContexts::default(), vec![], vec![], false, cx)
.1
.first()
.unwrap()
.clone();
inventory.scenario_scheduled(scenario.clone());
assert_eq!(
inventory
.list_debug_scenarios(&TaskContexts::default(), vec![], vec![], false, cx)
.0
.first()
.unwrap()
.clone(),
scenario
);
inventory
.update_file_based_scenarios(
TaskSettingsLocation::Global(Path::new("")),
Some(
r#"
[{
"label": "test scenario",
"adapter": "Delve",
"request": "launch",
"program": "wowzer",
}]
"#,
),
)
.unwrap();
assert_eq!(
inventory
.list_debug_scenarios(&TaskContexts::default(), vec![], vec![], false, cx)
.0
.first()
.unwrap()
.adapter,
"Delve",
);
inventory
.update_file_based_scenarios(
TaskSettingsLocation::Global(Path::new("")),
Some(
r#"
[{
"label": "testing scenario",
"adapter": "Delve",
"request": "launch",
"program": "wowzer",
}]
"#,
),
)
.unwrap();
assert_eq!(
inventory
.list_debug_scenarios(&TaskContexts::default(), vec![], vec![], false, cx)
.0
.first(),
None
);
});
}
#[gpui::test]
async fn test_inventory_static_task_filters(cx: &mut TestAppContext) {
init_test(cx);