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

Fix panic when showing contacts popover via keybinding

Browse source
This commit is contained in:
Antonio Scandurra 2023-05-02 11:47:05 +02:00
parent 484cda51cf
commit f985fac6f9
4 changed files with 99 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

109
crates/collab_ui/src/collab_titlebar_item.rs
View file

@ -3,7 +3,7 @@ use crate::{
toggle_screen_sharing, ToggleScreenSharing, toggle_screen_sharing, ToggleScreenSharing,
}; };
use call::{ActiveCall, ParticipantLocation, Room}; use call::{ActiveCall, ParticipantLocation, Room};
use client::{proto::PeerId, ContactEventKind, SignIn, SignOut, User, UserStore}; use client::{proto::PeerId, Client, ContactEventKind, SignIn, SignOut, User, UserStore};
use clock::ReplicaId; use clock::ReplicaId;
use contacts_popover::ContactsPopover; use contacts_popover::ContactsPopover;
use context_menu::{ContextMenu, ContextMenuItem}; use context_menu::{ContextMenu, ContextMenuItem};
@ -17,6 +17,7 @@ use gpui::{
AppContext, Entity, ImageData, ModelHandle, SceneBuilder, Subscription, View, ViewContext, AppContext, Entity, ImageData, ModelHandle, SceneBuilder, Subscription, View, ViewContext,
ViewHandle, WeakViewHandle, ViewHandle, WeakViewHandle,
}; };
use project::Project;
use settings::Settings; use settings::Settings;
use std::{ops::Range, sync::Arc}; use std::{ops::Range, sync::Arc};
use theme::{AvatarStyle, Theme}; use theme::{AvatarStyle, Theme};
@ -41,8 +42,10 @@ pub fn init(cx: &mut AppContext) {
} }
pub struct CollabTitlebarItem { pub struct CollabTitlebarItem {
workspace: WeakViewHandle<Workspace>, project: ModelHandle<Project>,
user_store: ModelHandle<UserStore>, user_store: ModelHandle<UserStore>,
client: Arc<Client>,
workspace: WeakViewHandle<Workspace>,
contacts_popover: Option<ViewHandle<ContactsPopover>>, contacts_popover: Option<ViewHandle<ContactsPopover>>,
user_menu: ViewHandle<ContextMenu>, user_menu: ViewHandle<ContextMenu>,
_subscriptions: Vec<Subscription>, _subscriptions: Vec<Subscription>,
@ -64,7 +67,7 @@ impl View for CollabTitlebarItem {
return Empty::new().into_any(); return Empty::new().into_any();
}; };
let project = workspace.read(cx).project().read(cx); let project = self.project.read(cx);
let mut project_title = String::new(); let mut project_title = String::new();
for (i, name) in project.worktree_root_names(cx).enumerate() { for (i, name) in project.worktree_root_names(cx).enumerate() {
if i > 0 { if i > 0 {
@ -89,8 +92,8 @@ impl View for CollabTitlebarItem {
.left(), .left(),
); );
let user = workspace.read(cx).user_store().read(cx).current_user(); let user = self.user_store.read(cx).current_user();
let peer_id = workspace.read(cx).client().peer_id(); let peer_id = self.client.peer_id();
if let Some(((user, peer_id), room)) = user if let Some(((user, peer_id), room)) = user
.zip(peer_id) .zip(peer_id)
.zip(ActiveCall::global(cx).read(cx).room().cloned()) .zip(ActiveCall::global(cx).read(cx).room().cloned())
@ -124,13 +127,16 @@ impl View for CollabTitlebarItem {
impl CollabTitlebarItem { impl CollabTitlebarItem {
pub fn new( pub fn new(
workspace: &ViewHandle<Workspace>, workspace: &Workspace,
user_store: ModelHandle<UserStore>, workspace_handle: &ViewHandle<Workspace>,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
) -> Self { ) -> Self {
let project = workspace.project().clone();
let user_store = workspace.app_state().user_store.clone();
let client = workspace.app_state().client.clone();
let active_call = ActiveCall::global(cx); let active_call = ActiveCall::global(cx);
let mut subscriptions = Vec::new(); let mut subscriptions = Vec::new();
subscriptions.push(cx.observe(workspace, |_, _, cx| cx.notify())); subscriptions.push(cx.observe(workspace_handle, |_, _, cx| cx.notify()));
subscriptions.push(cx.observe(&active_call, |this, _, cx| this.active_call_changed(cx))); subscriptions.push(cx.observe(&active_call, |this, _, cx| this.active_call_changed(cx)));
subscriptions.push(cx.observe_window_activation(|this, active, cx| { subscriptions.push(cx.observe_window_activation(|this, active, cx| {
this.window_activation_changed(active, cx) this.window_activation_changed(active, cx)
@ -160,8 +166,10 @@ impl CollabTitlebarItem {
); );
Self { Self {
workspace: workspace.downgrade(), workspace: workspace.weak_handle(),
user_store: user_store.clone(), project,
user_store,
client,
contacts_popover: None, contacts_popover: None,
user_menu: cx.add_view(|cx| { user_menu: cx.add_view(|cx| {
let mut menu = ContextMenu::new(cx); let mut menu = ContextMenu::new(cx);
@ -173,16 +181,14 @@ impl CollabTitlebarItem {
} }
fn window_activation_changed(&mut self, active: bool, cx: &mut ViewContext<Self>) { fn window_activation_changed(&mut self, active: bool, cx: &mut ViewContext<Self>) {
if let Some(workspace) = self.workspace.upgrade(cx) { let project = if active {
let project = if active { Some(self.project.clone())
Some(workspace.read(cx).project().clone()) } else {
} else { None
None };
}; ActiveCall::global(cx)
ActiveCall::global(cx) .update(cx, |call, cx| call.set_location(project.as_ref(), cx))
.update(cx, |call, cx| call.set_location(project.as_ref(), cx)) .detach_and_log_err(cx);
.detach_and_log_err(cx);
}
} }
fn active_call_changed(&mut self, cx: &mut ViewContext<Self>) { fn active_call_changed(&mut self, cx: &mut ViewContext<Self>) {
@ -193,41 +199,42 @@ impl CollabTitlebarItem {
} }
fn share_project(&mut self, _: &ShareProject, cx: &mut ViewContext<Self>) { fn share_project(&mut self, _: &ShareProject, cx: &mut ViewContext<Self>) {
if let Some(workspace) = self.workspace.upgrade(cx) { let active_call = ActiveCall::global(cx);
let active_call = ActiveCall::global(cx); let project = self.project.clone();
let project = workspace.read(cx).project().clone(); active_call
active_call .update(cx, |call, cx| call.share_project(project, cx))
.update(cx, |call, cx| call.share_project(project, cx)) .detach_and_log_err(cx);
.detach_and_log_err(cx);
}
} }
fn unshare_project(&mut self, _: &UnshareProject, cx: &mut ViewContext<Self>) { fn unshare_project(&mut self, _: &UnshareProject, cx: &mut ViewContext<Self>) {
if let Some(workspace) = self.workspace.upgrade(cx) { let active_call = ActiveCall::global(cx);
let active_call = ActiveCall::global(cx); let project = self.project.clone();
let project = workspace.read(cx).project().clone(); active_call
active_call .update(cx, |call, cx| call.unshare_project(project, cx))
.update(cx, |call, cx| call.unshare_project(project, cx)) .log_err();
.log_err();
}
} }
pub fn toggle_contacts_popover(&mut self, _: &ToggleContactsMenu, cx: &mut ViewContext<Self>) { pub fn toggle_contacts_popover(&mut self, _: &ToggleContactsMenu, cx: &mut ViewContext<Self>) {
if self.contacts_popover.take().is_none() { if self.contacts_popover.take().is_none() {
if let Some(workspace) = self.workspace.upgrade(cx) { let view = cx.add_view(|cx| {
let view = cx.add_view(|cx| ContactsPopover::new(&workspace, cx)); ContactsPopover::new(
cx.subscribe(&view, |this, _, event, cx| { self.project.clone(),
match event { self.user_store.clone(),
contacts_popover::Event::Dismissed => { self.workspace.clone(),
this.contacts_popover = None; cx,
} )
});
cx.subscribe(&view, |this, _, event, cx| {
match event {
contacts_popover::Event::Dismissed => {
this.contacts_popover = None;
} }
}
cx.notify(); cx.notify();
}) })
.detach(); .detach();
self.contacts_popover = Some(view); self.contacts_popover = Some(view);
}
} }
cx.notify(); cx.notify();
@ -493,12 +500,10 @@ impl CollabTitlebarItem {
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, move |_, this, cx| { .on_click(MouseButton::Left, move |_, this, cx| {
if let Some(workspace) = this.workspace.upgrade(cx) { let client = this.client.clone();
let client = workspace.read(cx).app_state().client.clone(); cx.app_context()
cx.app_context() .spawn(|cx| async move { client.authenticate_and_connect(true, &cx).await })
.spawn(|cx| async move { client.authenticate_and_connect(true, &cx).await }) .detach_and_log_err(cx);
.detach_and_log_err(cx);
}
}) })
.into_any() .into_any()
} }

12
crates/collab_ui/src/contact_list.rs
View file

@ -157,7 +157,12 @@ pub struct ContactList {
} }
impl ContactList { impl ContactList {
pub fn new(workspace: &ViewHandle<Workspace>, cx: &mut ViewContext<Self>) -> Self { pub fn new(
project: ModelHandle<Project>,
user_store: ModelHandle<UserStore>,
workspace: WeakViewHandle<Workspace>,
cx: &mut ViewContext<Self>,
) -> Self {
let filter_editor = cx.add_view(|cx| { let filter_editor = cx.add_view(|cx| {
let mut editor = Editor::single_line( let mut editor = Editor::single_line(
Some(Arc::new(|theme| { Some(Arc::new(|theme| {
@ -262,7 +267,6 @@ impl ContactList {
}); });
let active_call = ActiveCall::global(cx); let active_call = ActiveCall::global(cx);
let user_store = workspace.read(cx).user_store().clone();
let mut subscriptions = Vec::new(); let mut subscriptions = Vec::new();
subscriptions.push(cx.observe(&user_store, |this, _, cx| this.update_entries(cx))); subscriptions.push(cx.observe(&user_store, |this, _, cx| this.update_entries(cx)));
subscriptions.push(cx.observe(&active_call, |this, _, cx| this.update_entries(cx))); subscriptions.push(cx.observe(&active_call, |this, _, cx| this.update_entries(cx)));
@ -275,8 +279,8 @@ impl ContactList {
match_candidates: Default::default(), match_candidates: Default::default(),
filter_editor, filter_editor,
_subscriptions: subscriptions, _subscriptions: subscriptions,
project: workspace.read(cx).project().clone(), project,
workspace: workspace.downgrade(), workspace,
user_store, user_store,
}; };
this.update_entries(cx); this.update_entries(cx);

49
crates/collab_ui/src/contacts_popover.rs
View file

@ -8,6 +8,7 @@ use gpui::{
ViewContext, ViewHandle, WeakViewHandle, ViewContext, ViewHandle, WeakViewHandle,
}; };
use picker::PickerEvent; use picker::PickerEvent;
use project::Project;
use settings::Settings; use settings::Settings;
use workspace::Workspace; use workspace::Workspace;
@ -28,17 +29,26 @@ enum Child {
pub struct ContactsPopover { pub struct ContactsPopover {
child: Child, child: Child,
project: ModelHandle<Project>,
user_store: ModelHandle<UserStore>, user_store: ModelHandle<UserStore>,
workspace: WeakViewHandle<Workspace>, workspace: WeakViewHandle<Workspace>,
_subscription: Option<gpui::Subscription>, _subscription: Option<gpui::Subscription>,
} }
impl ContactsPopover { impl ContactsPopover {
pub fn new(workspace: &ViewHandle<Workspace>, cx: &mut ViewContext<Self>) -> Self { pub fn new(
project: ModelHandle<Project>,
user_store: ModelHandle<UserStore>,
workspace: WeakViewHandle<Workspace>,
cx: &mut ViewContext<Self>,
) -> Self {
let mut this = Self { let mut this = Self {
child: Child::ContactList(cx.add_view(|cx| ContactList::new(workspace, cx))), child: Child::ContactList(cx.add_view(|cx| {
user_store: workspace.read(cx).user_store().clone(), ContactList::new(project.clone(), user_store.clone(), workspace.clone(), cx)
workspace: workspace.downgrade(), })),
project,
user_store,
workspace,
_subscription: None, _subscription: None,
}; };
this.show_contact_list(String::new(), cx); this.show_contact_list(String::new(), cx);
@ -67,19 +77,24 @@ impl ContactsPopover {
} }
fn show_contact_list(&mut self, editor_text: String, cx: &mut ViewContext<ContactsPopover>) { fn show_contact_list(&mut self, editor_text: String, cx: &mut ViewContext<ContactsPopover>) {
if let Some(workspace) = self.workspace.upgrade(cx) { let child = cx.add_view(|cx| {
let child = cx ContactList::new(
.add_view(|cx| ContactList::new(&workspace, cx).with_editor_text(editor_text, cx)); self.project.clone(),
cx.focus(&child); self.user_store.clone(),
self._subscription = Some(cx.subscribe(&child, |this, _, event, cx| match event { self.workspace.clone(),
crate::contact_list::Event::Dismissed => cx.emit(Event::Dismissed), cx,
crate::contact_list::Event::ToggleContactFinder => { )
this.toggle_contact_finder(&Default::default(), cx) .with_editor_text(editor_text, cx)
} });
})); cx.focus(&child);
self.child = Child::ContactList(child); self._subscription = Some(cx.subscribe(&child, |this, _, event, cx| match event {
cx.notify(); crate::contact_list::Event::Dismissed => cx.emit(Event::Dismissed),
} crate::contact_list::Event::ToggleContactFinder => {
this.toggle_contact_finder(&Default::default(), cx)
}
}));
self.child = Child::ContactList(child);
cx.notify();
} }
} }

5
crates/zed/src/zed.rs
View file

@ -321,9 +321,8 @@ pub fn initialize_workspace(
cx.emit(workspace::Event::PaneAdded(workspace.active_pane().clone())); cx.emit(workspace::Event::PaneAdded(workspace.active_pane().clone()));
cx.emit(workspace::Event::PaneAdded(workspace.dock_pane().clone())); cx.emit(workspace::Event::PaneAdded(workspace.dock_pane().clone()));
let collab_titlebar_item = cx.add_view(|cx| { let collab_titlebar_item =
CollabTitlebarItem::new(&workspace_handle, app_state.user_store.clone(), cx) cx.add_view(|cx| CollabTitlebarItem::new(workspace, &workspace_handle, cx));
});
workspace.set_titlebar_item(collab_titlebar_item.into_any(), cx); workspace.set_titlebar_item(collab_titlebar_item.into_any(), cx);
let project_panel = ProjectPanel::new(workspace, cx); let project_panel = ProjectPanel::new(workspace, cx);