Merge branch 'main' into breadcrumbs

This commit is contained in:
Mikayla Maki
2022-10-17 16:51:38 -07:00
committed by GitHub
23 changed files with 448 additions and 311 deletions
+9
View File
@@ -909,6 +909,7 @@ message SelectionSet {
repeated Selection selections = 2;
uint32 lamport_timestamp = 3;
bool line_mode = 4;
CursorShape cursor_shape = 5;
}
message Selection {
@@ -918,6 +919,13 @@ message Selection {
bool reversed = 4;
}
enum CursorShape {
CursorBar = 0;
CursorBlock = 1;
CursorUnderscore = 2;
CursorHollow = 3;
}
message Anchor {
uint32 replica_id = 1;
uint32 local_timestamp = 2;
@@ -983,6 +991,7 @@ message Operation {
uint32 lamport_timestamp = 2;
repeated Selection selections = 3;
bool line_mode = 4;
CursorShape cursor_shape = 5;
}
message UpdateCompletionTriggers {
+1 -1
View File
@@ -6,4 +6,4 @@ pub use conn::Connection;
pub use peer::*;
mod macros;
pub const PROTOCOL_VERSION: u32 = 37;
pub const PROTOCOL_VERSION: u32 = 37;