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

WIP: pass synchronize channel buffers integration test

Browse source
This commit is contained in:
Mikayla 2023-08-21 17:53:37 -07:00
parent a7a4e2e369
commit 364ed1f840
No known key found for this signature in database
15 changed files with 411 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/rpc/proto/zed.proto
View file

@ -143,8 +143,10 @@ message Envelope {
SetChannelMemberAdmin set_channel_member_admin = 129;
RenameChannel rename_channel = 130;
GetChannelBuffer get_channel_buffer = 131;
GetChannelBufferResponse get_channel_buffer_response = 132;
OpenChannelBuffer open_channel_buffer = 131;
OpenChannelBufferResponse open_channel_buffer_response = 132;
UpdateChannelBuffer update_channel_buffer = 133;
CloseChannelBuffer close_channel_buffer = 134;
}
}
@ -543,6 +545,11 @@ message UpdateBuffer {
repeated Operation operations = 3;
}
message UpdateChannelBuffer {
uint64 buffer_id = 2;
repeated Operation operations = 3;
}
message UpdateBufferFile {
uint64 project_id = 1;
uint64 buffer_id = 2;
@ -951,13 +958,18 @@ message RenameChannel {
string name = 2;
}
message GetChannelBuffer {
message OpenChannelBuffer {
uint64 channel_id = 1;
}
message GetChannelBufferResponse {
string base_text = 1;
repeated Operation operations = 2;
message OpenChannelBufferResponse {
uint64 buffer_id = 1;
string base_text = 2;
repeated Operation operations = 3;
}
message CloseChannelBuffer {
uint64 buffer_id = 1;
}
message RespondToChannelInvite {
@ -1156,7 +1168,6 @@ enum GitStatus {
Conflict = 2;
}
message BufferState {
uint64 id = 1;
optional File file = 2;

11
crates/rpc/src/proto.rs
View file

@ -249,8 +249,10 @@ messages!(
(GetPrivateUserInfoResponse, Foreground),
(GetChannelMembers, Foreground),
(GetChannelMembersResponse, Foreground),
(GetChannelBuffer, Foreground),
(GetChannelBufferResponse, Foreground)
(OpenChannelBuffer, Foreground),
(OpenChannelBufferResponse, Foreground),
(CloseChannelBuffer, Background),
(UpdateChannelBuffer, Foreground)
);
request_messages!(
@ -317,7 +319,8 @@ request_messages!(
(UpdateParticipantLocation, Ack),
(UpdateProject, Ack),
(UpdateWorktree, Ack),
(GetChannelBuffer, GetChannelBufferResponse)
(OpenChannelBuffer, OpenChannelBufferResponse),
(CloseChannelBuffer, Ack)
);
entity_messages!(
@ -373,6 +376,8 @@ entity_messages!(
UpdateDiffBase
);
entity_messages!(buffer_id, UpdateChannelBuffer);
const KIB: usize = 1024;
const MIB: usize = KIB * 1024;
const MAX_BUFFER_LEN: usize = MIB;