andras/vault-link
andras/vault-link
Watch
1
0
Fork
You've already forked vault-link
 0
Code Issues Pull requests 18 Projects Releases 55 Packages Wiki Activity Actions 31

Consistent ordering

Browse source
This commit is contained in:
Andras Schmelczer 2025-03-16 18:19:36 +00:00
commit 74c007be25
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
1 changed files with 15 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

13
backend/reconcile/src/operation_transformation/edited_text.rs
View file

@ -211,7 +211,16 @@ where
usize::from(matches!(operation.operation, Operation::Delete { .. })),
// Make sure that the ordering is deterministic regardless which text
// is left or right.
operation.operation.get_hash(),
match &operation.operation {
Operation::Insert { text, .. } => text
.iter()
.map(super::super::tokenizer::token::Token::original)
.collect::<String>(),
Operation::Delete {
deleted_character_count,
..
} => deleted_character_count.to_string(),
},
)
},
)
@ -285,7 +294,7 @@ mod tests {
let original = "hello world! ...";
let left = "Hello world! I'm Andras.";
let right = "Hello world! How are you?";
let expected = "Hello world! I'm Andras. How are you?";
let expected = "Hello world! How are you? I'm Andras.";
let operations_1 = EditedText::from_strings(original, left);
let operations_2 = EditedText::from_strings(original, right);