mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-06 02:37:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix bug where open would offer to hang up a remote call

Browse source 
Co-authored-by: max <max@zed.dev>
This commit is contained in:
Mikayla Maki 2023-03-07 16:22:13 -08:00
parent 904993dfc9
commit 3594243644
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
crates/workspace/src/workspace.rs
View file

@ -228,16 +228,27 @@ pub fn init(app_state: Arc<AppState>, cx: &mut MutableAppContext) {
}
}
});
cx.add_action({
cx.add_async_action({
let app_state = Arc::downgrade(&app_state);
move |_, action: &OpenPaths, cx: &mut ViewContext<Workspace>| {
if let Some(app_state) = app_state.upgrade() {
let window_id = cx.window_id();
let action = action.clone();
cx.as_mut().defer(move |cx| {
open_paths(&action.paths, &app_state, Some(window_id), cx).detach();
})
move |workspace, action: &OpenPaths, cx: &mut ViewContext<Workspace>| {
if !workspace.project().read(cx).is_local() {
cx.propagate_action();
return None;
}
let app_state = app_state.upgrade()?;
let window_id = cx.window_id();
let action = action.clone();
let close = workspace.prepare_to_close(false, cx);
Some(cx.spawn_weak(|_, mut cx| async move {
let can_close = close.await?;
if can_close {
cx.update(|cx| open_paths(&action.paths, &app_state, Some(window_id), cx))
.await;
}
Ok(())
}))
}
});