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

Fix whitespaces

Browse source
This commit is contained in:
Andras Schmelczer 2025-03-02 17:53:21 +00:00
commit bf8d00c5e2
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
1 changed files with 53 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -65,7 +65,6 @@ where
Self::new(
original,
// Self::cook_operations(diff),
Self::cook_operations(Self::elongate_operations(diff)).collect(),
)
}
@ -191,7 +190,7 @@ where
pub fn merge(self, other: Self) -> Self {
debug_assert_eq!(
self.text, other.text,
"EditedText-s must be derived from the same text to be mergable"
"`EditedText`-s must be derived from the same text to be mergable"
);
let mut left_merge_context = MergeContext::default();
@ -285,7 +284,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! How are you?I'm Andras.";
let expected = "Hello world! I'm Andras. How are you?";
let operations_1 = EditedText::from_strings(original, left);
let operations_2 = EditedText::from_strings(original, right);