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

debugger: Go back to loading task contexts asynchronously for new session modal (#31908)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Cole Miller 2025-06-02 21:14:30 -04:00 • committed by GitHub
parent 6f97da3435
commit 7c1ae9bcc3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 51 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

68
crates/debugger_ui/src/new_process_modal.rs
View file

@ -89,33 +89,21 @@ impl NewProcessModal {
let languages = workspace.app_state().languages.clone(); let languages = workspace.app_state().languages.clone();
cx.spawn_in(window, async move |workspace, cx| { cx.spawn_in(window, async move |workspace, cx| {
let task_contexts = workspace let task_contexts = workspace.update_in(cx, |workspace, window, cx| {
.update_in(cx, |workspace, window, cx| { tasks_ui::task_contexts(workspace, window, cx)
tasks_ui::task_contexts(workspace, window, cx) })?;
})?
.await;
let task_contexts = Arc::new(task_contexts);
workspace.update_in(cx, |workspace, window, cx| { workspace.update_in(cx, |workspace, window, cx| {
let workspace_handle = workspace.weak_handle(); let workspace_handle = workspace.weak_handle();
workspace.toggle_modal(window, cx, |window, cx| { workspace.toggle_modal(window, cx, |window, cx| {
let attach_mode = AttachMode::new(None, workspace_handle.clone(), window, cx); let attach_mode = AttachMode::new(None, workspace_handle.clone(), window, cx);
let launch_picker = cx.new(|cx| { let launch_picker = cx.new(|cx| {
let mut delegate = let delegate =
DebugDelegate::new(debug_panel.downgrade(), task_store.clone()); DebugDelegate::new(debug_panel.downgrade(), task_store.clone());
delegate.task_contexts_loaded(task_contexts.clone(), languages, window, cx);
Picker::uniform_list(delegate, window, cx).modal(false) Picker::uniform_list(delegate, window, cx).modal(false)
}); });
let configure_mode = LaunchMode::new(window, cx); let configure_mode = LaunchMode::new(window, cx);
if let Some(active_cwd) = task_contexts
.active_context()
.and_then(|context| context.cwd.clone())
{
configure_mode.update(cx, |configure_mode, cx| {
configure_mode.load(active_cwd, window, cx);
});
}
let task_overrides = Some(TaskOverrides { reveal_target }); let task_overrides = Some(TaskOverrides { reveal_target });
@ -123,7 +111,7 @@ impl NewProcessModal {
task_modal: cx.new(|cx| { task_modal: cx.new(|cx| {
TasksModal::new( TasksModal::new(
task_store.clone(), task_store.clone(),
task_contexts, Arc::new(TaskContexts::default()),
task_overrides, task_overrides,
false, false,
workspace_handle.clone(), workspace_handle.clone(),
@ -148,6 +136,52 @@ impl NewProcessModal {
}), }),
]; ];
cx.spawn_in(window, {
let launch_picker = launch_picker.downgrade();
let configure_mode = configure_mode.downgrade();
let task_modal = task_mode.task_modal.downgrade();
async move |this, cx| {
let task_contexts = task_contexts.await;
let task_contexts = Arc::new(task_contexts);
launch_picker
.update_in(cx, |picker, window, cx| {
picker.delegate.task_contexts_loaded(
task_contexts.clone(),
languages,
window,
cx,
);
picker.refresh(window, cx);
cx.notify();
})
.ok();
if let Some(active_cwd) = task_contexts
.active_context()
.and_then(|context| context.cwd.clone())
{
configure_mode
.update_in(cx, |configure_mode, window, cx| {
configure_mode.load(active_cwd, window, cx);
})
.ok();
}
task_modal
.update_in(cx, |task_modal, window, cx| {
task_modal.task_contexts_loaded(task_contexts, window, cx);
})
.ok();
this.update(cx, |_, cx| {
cx.notify();
})
.ok();
}
})
.detach();
Self { Self {
debug_picker: launch_picker, debug_picker: launch_picker,
attach_mode, attach_mode,