barrett/likewise
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change inline changes code to patience

Browse source
This commit is contained in:
Armin Ronacher 2021-01-31 18:26:16 +01:00
parent 8ea4590a7b
commit 4db3f2f77e
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/text/inline.rs
View file

@ -1,6 +1,6 @@
use std::iter; use std::iter;
use crate::algorithms::{DiffOp, DiffTag}; use crate::algorithms::{Algorithm, DiffOp, DiffTag};
use crate::text::{Change, ChangeTag, TextDiff}; use crate::text::{Change, ChangeTag, TextDiff};
use super::split_chars; use super::split_chars;
@ -102,7 +102,9 @@ pub(crate) fn iter_inline_changes<'diff>(
let new_chars = split_chars(&new_value).collect::<Vec<_>>(); let new_chars = split_chars(&new_value).collect::<Vec<_>>();
let old_mindex = MultiIndex::new(&old_chars, old_value); let old_mindex = MultiIndex::new(&old_chars, old_value);
let new_mindex = MultiIndex::new(&new_chars, new_value); let new_mindex = MultiIndex::new(&new_chars, new_value);
let inline_diff = TextDiff::from_slices(&old_chars, &new_chars); let inline_diff = TextDiff::configure()
.algorithm(Algorithm::Patience)
.diff_slices(&old_chars, &new_chars);
if inline_diff.ratio() < 0.5 { if inline_diff.ratio() < 0.5 {
return Some(None.into_iter().chain(Some(change.into()).into_iter())); return Some(None.into_iter().chain(Some(change.into()).into_iter()));