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

fix following bugs (#7406)

Browse source 
- Another broken following test
- Fix following between two windows

Release Notes:

- Fixed following when the leader has multiple Zed windows open
This commit is contained in:
Conrad Irwin 2024-02-05 15:12:25 -07:00 • committed by GitHub
parent a80a3b8706
commit 0c34bd8935
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 119 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/workspace/src/item.rs
View file

@ -666,6 +666,7 @@ pub trait ProjectItem: Item {
Self: Sized;
}
#[derive(Debug)]
pub enum FollowEvent {
Unfollow,
}

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

@ -2910,25 +2910,27 @@ impl Workspace {
Ok(())
}
fn update_active_view_for_followers(&mut self, cx: &mut WindowContext) {
pub fn update_active_view_for_followers(&mut self, cx: &mut WindowContext) {
let mut is_project_item = true;
let mut update = proto::UpdateActiveView::default();
if let Some(item) = self.active_item(cx) {
if item.focus_handle(cx).contains_focused(cx) {
if let Some(item) = item.to_followable_item_handle(cx) {
is_project_item = item.is_project_item(cx);
update = proto::UpdateActiveView {
id: item
.remote_id(&self.app_state.client, cx)
.map(|id| id.to_proto()),
leader_id: self.leader_for_pane(&self.active_pane),
};
if cx.is_window_active() {
if let Some(item) = self.active_item(cx) {
if item.focus_handle(cx).contains_focused(cx) {
if let Some(item) = item.to_followable_item_handle(cx) {
is_project_item = item.is_project_item(cx);
update = proto::UpdateActiveView {
id: item
.remote_id(&self.app_state.client, cx)
.map(|id| id.to_proto()),
leader_id: self.leader_for_pane(&self.active_pane),
};
}
}
}
}
if update.id != self.last_active_view_id {
if &update.id != &self.last_active_view_id {
self.last_active_view_id = update.id.clone();
self.update_followers(
is_project_item,