+
-
-
+
+
-
-
+
+
-
-
-
-
-
+ ,
+ side: Side,
) -> Self {
let original_tokens = (tokenizer)(original);
let updated_tokens = (tokenizer)(&updated.text);
@@ -68,7 +69,7 @@ where
Self::new(
original,
- cook_operations(elongate_operations(diff)).collect(),
+ cook_operations(elongate_operations(diff), side).collect(),
updated.cursors,
)
}
@@ -223,6 +224,39 @@ where
builder.build()
}
+
+ #[must_use]
+ pub fn apply_with_history(&self) -> Vec<(History, String)> {
+ let mut builder: StringBuilder<'_> = StringBuilder::new(self.text);
+
+ let mut history = Vec::with_capacity(self.operations.len());
+
+ for operation in &self.operations {
+ builder = operation.apply(builder);
+
+ match operation {
+ Operation::Equal { .. } => history.push((History::Unchanged, builder.take())),
+ Operation::Insert { side, .. } => match side {
+ Side::Left => history.push((History::AddedFromLeft, builder.take())),
+ Side::Right => history.push((History::AddedFromRight, builder.take())),
+ },
+ Operation::Delete {
+ deleted_character_count,
+ order,
+ side,
+ ..
+ } => {
+ let deleted = self.text[*order..*order + *deleted_character_count].to_string();
+ match side {
+ Side::Left => history.push((History::RemovedFromLeft, deleted)),
+ Side::Right => history.push((History::RemovedFromRight, deleted)),
+ }
+ }
+ }
+ }
+
+ history
+ }
}
#[cfg(test)]
@@ -237,7 +271,7 @@ mod tests {
let left = "hello world! How are you? Adam";
let right = "Hello, my friend! How are you doing? Albert";
- let operations = EditedText::from_strings(left, right.into());
+ let operations = EditedText::from_strings(left, right.into(), Side::Right);
insta::assert_debug_snapshot!(operations);
@@ -249,7 +283,7 @@ mod tests {
fn test_calculate_operations_with_no_diff() {
let text = "hello world!";
- let operations = EditedText::from_strings(text, text.into());
+ let operations = EditedText::from_strings(text, text.into(), Side::Right);
assert_debug_snapshot!(operations);
@@ -264,8 +298,8 @@ mod tests {
let right = "Hello world! How are you?";
let expected = "Hello world! How are you? I'm Andras.";
- let operations_1 = EditedText::from_strings(original, left.into());
- let operations_2 = EditedText::from_strings(original, right.into());
+ let operations_1 = EditedText::from_strings(original, left.into(), Side::Left);
+ let operations_2 = EditedText::from_strings(original, right.into(), Side::Right);
let operations = operations_1.merge(operations_2);
assert_eq!(operations.apply(), expected);
diff --git a/src/operation_transformation/operation.rs b/src/operation_transformation/operation.rs
index 6efaa91..ca2f128 100644
--- a/src/operation_transformation/operation.rs
+++ b/src/operation_transformation/operation.rs
@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
use crate::{
Token,
utils::{
- find_longest_prefix_contained_within::find_longest_prefix_contained_within,
+ find_longest_prefix_contained_within::find_longest_prefix_contained_within, side::Side,
string_builder::StringBuilder,
},
};
@@ -27,11 +27,15 @@ where
},
Insert {
+ side: Side,
+
order: usize,
text: Vec>,
},
Delete {
+ side: Side,
+
order: usize,
deleted_character_count: usize,
@@ -68,14 +72,15 @@ where
}
/// Creates an insert operation with the given index and text.
- pub fn create_insert(order: usize, text: Vec>) -> Self {
- Operation::Insert { order, text }
+ pub fn create_insert(order: usize, text: Vec>, side: Side) -> Self {
+ Operation::Insert { side, order, text }
}
/// Creates a delete operation with the given index and number of
/// to-be-deleted characters.
- pub fn create_delete(order: usize, deleted_character_count: usize) -> Self {
+ pub fn create_delete(order: usize, deleted_character_count: usize, side: Side) -> Self {
Operation::Delete {
+ side,
order,
deleted_character_count,
@@ -84,8 +89,9 @@ where
}
}
- pub fn create_delete_with_text(order: usize, text: String) -> Self {
+ pub fn create_delete_with_text(order: usize, text: String, side: Side) -> Self {
Operation::Delete {
+ side,
order,
deleted_character_count: text.chars().count(),
@@ -200,7 +206,7 @@ where
match (operation, previous_operation) {
(
- Operation::Insert { order, text },
+ Operation::Insert { side, order, text },
Some(Operation::Insert {
text: previous_inserted_text,
..
@@ -212,11 +218,12 @@ where
let offset_in_tokens =
find_longest_prefix_contained_within(previous_inserted_text, &text);
- Operation::create_insert(order, text[offset_in_tokens..].to_vec())
+ Operation::create_insert(order, text[offset_in_tokens..].to_vec(), side)
}
(
Operation::Delete {
+ side,
order,
deleted_character_count,
@@ -240,19 +247,20 @@ where
#[cfg(debug_assertions)]
let updated_delete = deleted_text.as_ref().map_or_else(
- || Operation::create_delete(order + overlap, new_length),
+ || Operation::create_delete(order + overlap, new_length, side),
|text| {
Operation::create_delete_with_text(
order + overlap,
text.chars()
.skip(deleted_character_count - new_length)
.collect::(),
+ side,
)
},
);
#[cfg(not(debug_assertions))]
- let updated_delete = Operation::create_delete(order + overlap, new_length);
+ let updated_delete = Operation::create_delete(order + overlap, new_length, side);
updated_delete
}
@@ -334,6 +342,7 @@ where
#[cfg(debug_assertions)]
text,
+ ..
} => {
#[cfg(debug_assertions)]
write!(
@@ -349,7 +358,7 @@ where
Ok(())
}
- Operation::Insert { order, text } => {
+ Operation::Insert { order, text, .. } => {
write!(
f,
"",
@@ -365,6 +374,7 @@ where
#[cfg(debug_assertions)]
deleted_text,
+ ..
} => {
#[cfg(debug_assertions)]
write!(
@@ -404,7 +414,8 @@ mod tests {
#[test]
fn test_apply_delete_with_create() {
let builder = StringBuilder::new("hello world");
- let delete_operation = Operation::<()>::create_delete_with_text(0, "hello ".to_owned());
+ let delete_operation =
+ Operation::<()>::create_delete_with_text(0, "hello ".to_owned(), Side::Left);
let retain_operation = Operation::<()>::create_equal(6, 5);
let mut builder = delete_operation.apply(builder);
@@ -418,7 +429,7 @@ mod tests {
let builder = StringBuilder::new("hello");
let retain_operation = Operation::<()>::create_equal(0, 5);
- let insert_operation = Operation::create_insert(5, vec![" my friend".into()]);
+ let insert_operation = Operation::create_insert(5, vec![" my friend".into()], Side::Right);
let mut builder = retain_operation.apply(builder);
builder = insert_operation.apply(builder);
diff --git a/src/operation_transformation/utils/cook_operations.rs b/src/operation_transformation/utils/cook_operations.rs
index 7d5f85e..6ec3b43 100644
--- a/src/operation_transformation/utils/cook_operations.rs
+++ b/src/operation_transformation/utils/cook_operations.rs
@@ -1,8 +1,10 @@
-use crate::{diffs::raw_operation::RawOperation, operation_transformation::Operation};
+use crate::{
+ diffs::raw_operation::RawOperation, operation_transformation::Operation, utils::side::Side,
+};
/// Turn raw operations into ordered operations while keeping track of the
/// original token's indexes.
-pub fn cook_operations(raw_operations: I) -> impl Iterator- >
+pub fn cook_operations
(raw_operations: I, side: Side) -> impl Iterator- >
where
I: IntoIterator
- >,
T: PartialEq + Clone + std::fmt::Debug,
@@ -27,15 +29,18 @@ where
op
}
- RawOperation::Insert(tokens) => Operation::create_insert(original_text_index, tokens),
+ RawOperation::Insert(tokens) => {
+ Operation::create_insert(original_text_index, tokens, side)
+ }
RawOperation::Delete(..) => {
let op = if cfg!(debug_assertions) {
Operation::create_delete_with_text(
original_text_index,
raw_operation.get_original_text(),
+ side,
)
} else {
- Operation::create_delete(original_text_index, length)
+ Operation::create_delete(original_text_index, length, side)
};
original_text_index += length;
diff --git a/src/utils.rs b/src/utils.rs
index 91330ca..8d31e66 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -1,5 +1,6 @@
pub mod common_prefix_len;
pub mod common_suffix_len;
pub mod find_longest_prefix_contained_within;
+pub mod history;
pub mod side;
pub mod string_builder;
diff --git a/src/utils/history.rs b/src/utils/history.rs
new file mode 100644
index 0000000..91acd7a
--- /dev/null
+++ b/src/utils/history.rs
@@ -0,0 +1,15 @@
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
+#[cfg(feature = "wasm")]
+use wasm_bindgen::prelude::*;
+
+#[cfg_attr(feature = "wasm", wasm_bindgen)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum History {
+ Unchanged = "Unchanged",
+ AddedFromLeft = "AddedFromLeft",
+ AddedFromRight = "AddedFromRight",
+ RemovedFromLeft = "RemovedFromLeft",
+ RemovedFromRight = "RemovedFromRight",
+}
diff --git a/src/utils/side.rs b/src/utils/side.rs
index 825fa9e..54dba6f 100644
--- a/src/utils/side.rs
+++ b/src/utils/side.rs
@@ -1,5 +1,9 @@
use std::fmt::Display;
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
+
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Side {
Left,
diff --git a/src/utils/string_builder.rs b/src/utils/string_builder.rs
index af24d82..ee23fc6 100644
--- a/src/utils/string_builder.rs
+++ b/src/utils/string_builder.rs
@@ -35,7 +35,8 @@ impl StringBuilder<'_> {
self.original.nth(length - 1);
- if cfg!(debug_assertions) {
+ #[cfg(debug_assertions)]
+ {
self.remaining = self.remaining.chars().skip(length).collect();
}
}
@@ -44,20 +45,28 @@ impl StringBuilder<'_> {
pub fn retain(&mut self, length: usize) {
self.buffer.extend(self.original.by_ref().take(length));
- if cfg!(debug_assertions) {
+ #[cfg(debug_assertions)]
+ {
self.remaining = self.remaining.chars().skip(length).collect();
}
}
+ /// Returns the currently built buffer and clears it.
+ pub fn take(&mut self) -> String {
+ let result = self.buffer.clone();
+ self.buffer.clear();
+ result
+ }
+
/// Finish building the string after copying the remaining original string
/// since the last insertion or deletion.
pub fn build(self) -> String { self.buffer }
- #[cfg(debug_assertions)]
/// Get a slice of the remaining original string. The slice starts from
/// where the next delete/retain operation would start and is of length
/// `length`. The implementation is quite suboptimal but it's only used
/// for debugging.
+ #[cfg(debug_assertions)]
pub fn get_slice_from_remaining(&self, length: usize) -> String {
let result = self.remaining.chars().take(length).collect::
();
diff --git a/src/wasm.rs b/src/wasm.rs
index 43f39f5..bf13f0a 100644
--- a/src/wasm.rs
+++ b/src/wasm.rs
@@ -1,2 +1,2 @@
-pub mod cursor;
pub mod lib;
+pub mod types;
diff --git a/src/wasm/lib.rs b/src/wasm/lib.rs
index 3188e1f..71f8afe 100644
--- a/src/wasm/lib.rs
+++ b/src/wasm/lib.rs
@@ -13,7 +13,7 @@ use core::str;
use wasm_bindgen::prelude::*;
-use crate::wasm::cursor::JsTextWithCursors;
+use crate::wasm::types::{JsTextWithCursors, JsTextWithHistory};
/// Merge two documents with a common parent. Relies on `reconcile::reconcile`
/// for texts and returns the right document as-is if either of the updated
@@ -58,6 +58,18 @@ pub fn merge_text(parent: &str, left: &str, right: &str) -> String {
crate::reconcile(parent, left, right)
}
+/// WASM wrapper around `crate::reconcile` for merging text.
+#[wasm_bindgen(js_name = mergeTextWithHistory)]
+#[must_use]
+pub fn merge_text_with_history(parent: &str, left: &str, right: &str) -> Vec {
+ set_panic_hook();
+
+ crate::reconcile_with_history(parent, left, right)
+ .into_iter()
+ .map(Into::into)
+ .collect()
+}
+
/// WASM wrapper around `reconcile::reconcile_with_cursors` for merging text.
#[wasm_bindgen(js_name = mergeTextWithCursors)]
#[must_use]
diff --git a/src/wasm/cursor.rs b/src/wasm/types.rs
similarity index 81%
rename from src/wasm/cursor.rs
rename to src/wasm/types.rs
index 9e72095..d2aa486 100644
--- a/src/wasm/cursor.rs
+++ b/src/wasm/types.rs
@@ -1,5 +1,7 @@
use wasm_bindgen::prelude::*;
+use crate::History;
+
/// Wrapper type to expose `TextWithCursors` to JS.
#[wasm_bindgen]
#[derive(Debug, Clone, PartialEq)]
@@ -86,3 +88,24 @@ impl From for JsCursorPosition {
}
}
}
+
+/// Wrapper type to expose `(History, String)` to JS.
+#[wasm_bindgen]
+#[derive(Debug, Clone, PartialEq)]
+pub struct JsTextWithHistory {
+ history: History,
+ text: String,
+}
+
+impl From<(History, String)> for JsTextWithHistory {
+ fn from((history, text): (History, String)) -> Self { JsTextWithHistory { history, text } }
+}
+
+#[wasm_bindgen]
+impl JsTextWithHistory {
+ #[must_use]
+ pub fn history(&self) -> History { self.history }
+
+ #[must_use]
+ pub fn text(&self) -> String { self.text.clone() }
+}
diff --git a/tests/examples/deletes.yml b/tests/examples/deletes.yml
index 3476e95..9aece4c 100644
--- a/tests/examples/deletes.yml
+++ b/tests/examples/deletes.yml
@@ -25,10 +25,10 @@ right: long with big and small
expected: long small
---
-parent: long run of text where one barely has no changes but has cursors
-left: long| run of tex|t where one barely has no |changes but has |cursors
-right: long run one barely has no changes cursors
-expected: long| ru|n one barely has no |changes |cursors
+parent: long run of text where one barely has changes but has cursors
+left: long| run of tex|t where one barely has |changes but has |cursors
+right: long run one barely has changes cursors
+expected: long| ru|n one barely has |changes |cursors
---
parent: long text where the cursor has to be clamped after delete
diff --git a/tests/web.rs b/tests/web.rs
index a992051..80da0f7 100644
--- a/tests/web.rs
+++ b/tests/web.rs
@@ -1,8 +1,8 @@
#![cfg(feature = "wasm")]
use reconcile::wasm::{
- cursor::{JsCursorPosition, JsTextWithCursors},
lib::{is_binary, is_file_type_mergable, merge, merge_text, merge_text_with_cursors},
+ types::{JsCursorPosition, JsTextWithCursors},
};
use wasm_bindgen_test::*;
+
+
@@ -64,9 +91,15 @@
width="24"
height="24"
viewBox="0 0 24 24"
+ fill="none"
+ stroke="currentColor"
+ stroke-width="2"
+ stroke-linecap="round"
+ stroke-linejoin="round"
>
+