andras/reconcile
andras/reconcile
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Lint

Browse source
This commit is contained in:
Andras Schmelczer 2024-11-24 22:33:24 +00:00
commit 3391d2c0ec
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend/reconcile/src/diffs/raw_operation.rs
View file

@ -37,13 +37,13 @@ where
pub fn extend(self, other: RawOperation<T>) -> Option<RawOperation<T>> { pub fn extend(self, other: RawOperation<T>) -> Option<RawOperation<T>> {
match (self, other) { match (self, other) {
(RawOperation::Insert(tokens1), RawOperation::Insert(tokens2)) => Some( (RawOperation::Insert(tokens1), RawOperation::Insert(tokens2)) => Some(
RawOperation::Insert(tokens1.into_iter().chain(tokens2.into_iter()).collect()), RawOperation::Insert(tokens1.into_iter().chain(tokens2).collect()),
), ),
(RawOperation::Delete(tokens1), RawOperation::Delete(tokens2)) => Some( (RawOperation::Delete(tokens1), RawOperation::Delete(tokens2)) => Some(
RawOperation::Delete(tokens1.into_iter().chain(tokens2.into_iter()).collect()), RawOperation::Delete(tokens1.into_iter().chain(tokens2).collect()),
), ),
(RawOperation::Equal(tokens1), RawOperation::Equal(tokens2)) => Some( (RawOperation::Equal(tokens1), RawOperation::Equal(tokens2)) => Some(
RawOperation::Equal(tokens1.into_iter().chain(tokens2.into_iter()).collect()), RawOperation::Equal(tokens1.into_iter().chain(tokens2).collect()),
), ),
_ => None, _ => None,
} }

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

@ -10,7 +10,6 @@ use crate::{diffs::myers::diff, utils::merge_iters::MergeSorted};
use ropey::Rope; use ropey::Rope;
use std::hash::Hash; use std::hash::Hash;
use std::iter; use std::iter;
use std::path::Iter;
#[cfg(feature = "serde")] #[cfg(feature = "serde")]
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -59,7 +58,7 @@ impl<'a> EditedText<'a> {
Self::new( Self::new(
original, original,
// Self::cook_operations(diff), // Self::cook_operations(diff),
Self::cook_operations(Self::elongate_operations(diff.into_iter())).collect(), Self::cook_operations(Self::elongate_operations(diff)).collect(),
) )
} }