mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-18 08:02:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Remove one todo from the critical path

Browse source
This commit is contained in:
Nathan Sobo 2023-10-31 21:19:32 -06:00
parent 0ecf6bde73
commit 4da8ee1e1d
2 changed files with 84 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
crates/gpui2/src/window.rs
View file

@ -1993,6 +1993,23 @@ impl<V: 'static> WindowHandle<V> {
state_type: PhantomData,
}
}
pub fn update<R>(
&self,
cx: &mut AppContext,
update: impl FnOnce(&mut V, &mut ViewContext<V>) -> R,
) -> Result<R> {
cx.update_window(self.any_handle, |cx| {
let root_view = cx
.window
.root_view
.clone()
.unwrap()
.downcast::<V>()
.unwrap();
root_view.update(cx, update)
})
}
}
impl<V: 'static> Into<AnyWindowHandle> for WindowHandle<V> {

134
crates/workspace2/src/workspace2.rs
View file

@ -25,7 +25,7 @@ use futures::{
use gpui2::{
AnyModel, AnyView, AppContext, AsyncAppContext, AsyncWindowContext, DisplayId, Entity,
EventEmitter, MainThread, Model, ModelContext, Subscription, Task, View, ViewContext,
VisualContext, WeakModel, WeakView, WindowBounds, WindowContext, WindowHandle, WindowOptions,
VisualContext, WeakView, WindowBounds, WindowContext, WindowHandle, WindowOptions,
};
use item::{FollowableItem, FollowableItemHandle, Item, ItemHandle, ProjectItem};
use language2::LanguageRegistry;
@ -2812,54 +2812,56 @@ impl Workspace {
// // RPC handlers
// fn handle_follow(
// &mut self,
// follower_project_id: Option<u64>,
// cx: &mut ViewContext<Self>,
// ) -> proto::FollowResponse {
// let client = &self.app_state.client;
// let project_id = self.project.read(cx).remote_id();
fn handle_follow(
&mut self,
follower_project_id: Option<u64>,
cx: &mut ViewContext<Self>,
) -> proto::FollowResponse {
todo!()
// let active_view_id = self.active_item(cx).and_then(|i| {
// Some(
// i.to_followable_item_handle(cx)?
// .remote_id(client, cx)?
// .to_proto(),
// )
// });
// let client = &self.app_state.client;
// let project_id = self.project.read(cx).remote_id();
// cx.notify();
// let active_view_id = self.active_item(cx).and_then(|i| {
// Some(
// i.to_followable_item_handle(cx)?
// .remote_id(client, cx)?
// .to_proto(),
// )
// });
// self.last_active_view_id = active_view_id.clone();
// proto::FollowResponse {
// active_view_id,
// views: self
// .panes()
// .iter()
// .flat_map(|pane| {
// let leader_id = self.leader_for_pane(pane);
// pane.read(cx).items().filter_map({
// let cx = &cx;
// move |item| {
// let item = item.to_followable_item_handle(cx)?;
// if (project_id.is_none() || project_id != follower_project_id)
// && item.is_project_item(cx)
// {
// return None;
// }
// let id = item.remote_id(client, cx)?.to_proto();
// let variant = item.to_state_proto(cx)?;
// Some(proto::View {
// id: Some(id),
// leader_id,
// variant: Some(variant),
// })
// }
// })
// })
// .collect(),
// }
// }
// cx.notify();
// self.last_active_view_id = active_view_id.clone();
// proto::FollowResponse {
// active_view_id,
// views: self
// .panes()
// .iter()
// .flat_map(|pane| {
// let leader_id = self.leader_for_pane(pane);
// pane.read(cx).items().filter_map({
// let cx = &cx;
// move |item| {
// let item = item.to_followable_item_handle(cx)?;
// if (project_id.is_none() || project_id != follower_project_id)
// && item.is_project_item(cx)
// {
// return None;
// }
// let id = item.remote_id(client, cx)?.to_proto();
// let variant = item.to_state_proto(cx)?;
// Some(proto::View {
// id: Some(id),
// leader_id,
// variant: Some(variant),
// })
// }
// })
// })
// .collect(),
// }
}
fn handle_update_followers(
&mut self,
@ -3942,7 +3944,7 @@ impl WorkspaceStore {
.log_err()
}
async fn handle_follow(
pub async fn handle_follow(
this: Model<Self>,
envelope: TypedEnvelope<proto::Follow>,
_: Arc<Client>,
@ -3953,30 +3955,28 @@ impl WorkspaceStore {
project_id: envelope.payload.project_id,
peer_id: envelope.original_sender_id()?,
};
let active_project = ActiveCall::global(cx).read(cx).location();
let active_project = ActiveCall::global(cx).read(cx).location().cloned();
let mut response = proto::FollowResponse::default();
for workspace in &this.workspaces {
let Some(workspace) = workspace.upgrade(cx) else {
continue;
};
workspace.update(cx, |workspace, cx| {
let handler_response = workspace.handle_follow(follower.project_id, cx);
if response.views.is_empty() {
response.views = handler_response.views;
} else {
response.views.extend_from_slice(&handler_response.views);
}
if let Some(active_view_id) = handler_response.active_view_id.clone() {
if response.active_view_id.is_none()
|| Some(workspace.project.downgrade()) == active_project
{
response.active_view_id = Some(active_view_id);
workspace
.update(cx, |workspace, cx| {
let handler_response = workspace.handle_follow(follower.project_id, cx);
if response.views.is_empty() {
response.views = handler_response.views;
} else {
response.views.extend_from_slice(&handler_response.views);
}
}
});
if let Some(active_view_id) = handler_response.active_view_id.clone() {
if response.active_view_id.is_none()
|| Some(workspace.project.downgrade()) == active_project
{
response.active_view_id = Some(active_view_id);
}
}
})
.ok();
}
if let Err(ix) = this.followers.binary_search(&follower) {