mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-28 11:29:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix opening channel notes from collab panel context menu (#2998)

Browse source 
Release Notes:

- Fixed a bug where the 'Open Notes' action in the collaboration panel
context menu didn't work (preview only).
This commit is contained in:
Max Brunsfeld 2023-09-20 13:55:23 -07:00 committed by GitHub
commit ee16b2051e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
crates/collab_ui/src/collab_panel.rs
View file

@ -87,7 +87,7 @@ struct ManageMembers {
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub struct OpenChannelNotes { pub struct OpenChannelNotes {
pub channel_id: u64, pub channel_id: ChannelId,
} }
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
@ -95,11 +95,6 @@ pub struct JoinChannelCall {
pub channel_id: u64, pub channel_id: u64,
} }
#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
struct OpenChannelBuffer {
channel_id: ChannelId,
}
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
struct StartMoveChannelFor { struct StartMoveChannelFor {
channel_id: ChannelId, channel_id: ChannelId,
@ -155,7 +150,6 @@ impl_actions!(
ToggleCollapse, ToggleCollapse,
OpenChannelNotes, OpenChannelNotes,
JoinChannelCall, JoinChannelCall,
OpenChannelBuffer,
LinkChannel, LinkChannel,
StartMoveChannelFor, StartMoveChannelFor,
StartLinkChannelFor, StartLinkChannelFor,
@ -2318,7 +2312,7 @@ impl CollabPanel {
items.push(ContextMenuItem::action( items.push(ContextMenuItem::action(
"Open Notes", "Open Notes",
OpenChannelBuffer { OpenChannelNotes {
channel_id: path.channel_id(), channel_id: path.channel_id(),
}, },
)); ));