Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Fix navigating to Collab URLs not working when not connected (#59652)
Ben Kunklef36a0089051c
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rsindex b23f0774ad4..f196153aed6 100644--- a/crates/zed/src/main.rs+++ b/crates/zed/src/main.rs@@ -67,11 +67,13 @@ use std::{};use theme::{ActiveTheme, GlobalTheme, ThemeRegistry};use theme_settings::load_user_theme;-use util::{ResultExt, TryFutureExt, maybe};+use util::{ResultExt, maybe};use uuid::Uuid;use workspace::{AppState, MultiWorkspace, SerializedWorkspaceLocation, SessionWorkspace, Toast,- WorkspaceSettings, WorkspaceStore, notifications::NotificationId, restore_multiworkspace,+ WorkspaceSettings, WorkspaceStore,+ notifications::{NotificationId, NotifyResultExt},+ restore_multiworkspace,};use zed::{OpenListener, OpenRequest, RawOpenRequest, app_menus, build_window_options,@@ -1391,9 +1393,9 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &muttask.await?;}let client = app_state.client.clone();- // we continue even if authentication fails as join_channel/ open channel notes will+ // we continue even if connection fails as join_channel/ open channel notes will// show a visible error message.- authenticate(client, cx).await.log_err();+ client.connect(true, cx).await.into_response().log_err();if let Some(channel_id) = request.join_channel {cx.update(|cx| {@@ -1412,6 +1414,7 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mutworkspace::get_any_active_multi_workspace(app_state, cx.clone()).await?;let workspace = workspace_window.read_with(cx, |mw, _| mw.workspace().clone())?;+ let weak_workspace = workspace.downgrade();let mut promises = Vec::new();for (channel_id, heading) in request.open_channel_notes {@@ -1423,10 +1426,11 @@ fn handle_open_request(request: OpenRequest, app_state: Arc<AppState>, cx: &mutwindow,cx,)- .log_err()})?)}- future::join_all(promises).await;+ for result in future::join_all(promises).await {+ result.notify_workspace_async_err(weak_workspace.clone(), cx);+ }anyhow::Ok(())}).await;