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

Store tokens instead of text in insert

Browse source
This commit is contained in:
Andras Schmelczer 2024-11-28 20:51:05 +00:00
commit 44f9a44f63
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
10 changed files with 144 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/reconcile/src/operation_transformation/mod.rs
View file

@ -4,9 +4,8 @@ mod operation;
pub use edited_text::EditedText;
pub use operation::Operation;
use std::hash::Hash;
use crate::{errors::SyncLibError, tokenizer::token::Token};
use crate::{errors::SyncLibError, tokenizer::Tokenizer};
pub fn reconcile(original: &str, left: &str, right: &str) -> Result<String, SyncLibError> {
let left_operations = EditedText::from_strings(original, left);
@ -20,11 +19,10 @@ pub fn reconcile_with_tokenizer<F, T>(
original: &str,
left: &str,
right: &str,
tokenizer: &F,
tokenizer: &Tokenizer<T>,
) -> Result<String, SyncLibError>
where
F: Fn(&str) -> Vec<Token<T>>,
T: PartialEq + Hash + Clone,
T: PartialEq + Clone,
{
let left_operations = EditedText::from_strings_with_tokenizer(original, left, tokenizer);
let right_operations = EditedText::from_strings_with_tokenizer(original, right, tokenizer);