andras/vault-link
andras/vault-link
1
0
Fork 0
Code Issues Pull requests 19 Projects Releases 55 Packages Wiki Activity Actions 28

Merge inserts with inserts

Browse source
This commit is contained in:
Andras Schmelczer 2024-11-29 22:20:42 +00:00
commit 3303a31cc4
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
7 changed files with 154 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -197,7 +197,14 @@ where
.map(|op| (op, Side::Left))
.merge_sorted_by_key(
other.operations.into_iter().map(|op| (op, Side::Right)),
|(operation, _)| operation.order,
|(operation, _)| {
(
operation.order,
// Operations on left and right must come in the same order so that
// inserts can be merged with other inserts and deletes with deletes.
matches!(operation.operation, Operation::Delete { .. }) as usize,
)
},
)
.flat_map(|(OrderedOperation { order, operation }, side)| {
match side {
@ -272,7 +279,7 @@ mod tests {
#[test]
fn test_calculate_operations_with_insert() {
let original = "hello world! ...";
let left = "hello world! I'm Andras.";
let left = "Hello world! I'm Andras.";
let right = "Hello world! How are you?";
let expected = "Hello world! I'm Andras.How are you?";
@ -282,7 +289,6 @@ mod tests {
println!("{:#?}", operations_2);
let operations = operations_1.merge(operations_2);
assert_eq!(operations.apply().unwrap(), expected);
}
}