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

Ensure prior, deferred selections don't override newer selections

Browse source
This commit is contained in:
Antonio Scandurra 2022-01-05 15:43:26 +01:00
parent eb65a5d29a
commit e56609cf0c
3 changed files with 48 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -287,6 +287,7 @@ message BufferFragment {
message SelectionSet {
uint32 replica_id = 1;
repeated Selection selections = 2;
uint32 lamport_timestamp = 3;
}
message Selection {
@ -344,8 +345,7 @@ message Operation {
Edit edit = 1;
Undo undo = 2;
UpdateSelections update_selections = 3;
RemoveSelections remove_selections = 4;
UpdateDiagnosticSet update_diagnostic_set = 5;
UpdateDiagnosticSet update_diagnostic_set = 4;
}
message Edit {
@ -371,11 +371,6 @@ message Operation {
uint32 lamport_timestamp = 3;
repeated Selection selections = 4;
}
message RemoveSelections {
uint32 replica_id = 1;
uint32 lamport_timestamp = 3;
}
}
message UndoMapEntry {