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

Merge branch 'main' into user-timeline

Browse source
This commit is contained in:
Antonio Scandurra 2022-07-04 09:23:16 +02:00
commit d3b9eca791
50 changed files with 3076 additions and 1109 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -172,7 +172,7 @@ message JoinProjectResponse {
message Accept {
uint32 replica_id = 1;
repeated Worktree worktrees = 2;
repeated WorktreeMetadata worktrees = 2;
repeated Collaborator collaborators = 3;
repeated LanguageServer language_servers = 4;
}
@ -199,6 +199,7 @@ message UpdateWorktree {
repeated Entry updated_entries = 4;
repeated uint64 removed_entries = 5;
uint64 scan_id = 6;
bool is_last_update = 7;
}
message UpdateWorktreeExtensions {
@ -776,15 +777,6 @@ message User {
string avatar_url = 3;
}
message Worktree {
uint64 id = 1;
string root_name = 2;
repeated Entry entries = 3;
repeated DiagnosticSummary diagnostic_summaries = 4;
bool visible = 5;
uint64 scan_id = 6;
}
message File {
uint64 worktree_id = 1;
optional uint64 entry_id = 2;