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

Performance improvements for LCS and inline highlighting (#16)

Browse source
This commit is contained in:
Armin Ronacher 2021-02-17 20:59:55 +01:00 • committed by GitHub
parent bdb1f7a644
commit 45bcb3943c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/text/inline.rs
View file

@ -8,6 +8,8 @@ use crate::{capture_diff, get_diff_ratio};
use std::ops::Index;
use super::utils::upper_seq_ratio;
struct MultiLookup<'bufs, 's, T: DiffableStr + ?Sized> {
strings: &'bufs [&'s T],
seqs: Vec<(&'s T, usize, usize)>,
@ -184,6 +186,8 @@ impl<'s, T: DiffableStr + ?Sized> fmt::Display for InlineChange<'s, T> {
}
}
const MIN_RATIO: f32 = 0.5;
pub(crate) fn iter_inline_changes<'x, 'diff, 'old, 'new, 'bufs, T>(
diff: &'diff TextDiff<'old, 'new, 'bufs, T>,
op: &DiffOp,
@ -204,6 +208,11 @@ where
let mut new_index = new_range.start;
let old_slices = &diff.old_slices()[old_range];
let new_slices = &diff.new_slices()[new_range];
if upper_seq_ratio(old_slices, new_slices) < MIN_RATIO {
return Box::new(diff.iter_changes(op).map(|x| x.into())) as Box<dyn Iterator<Item = _>>;
}
let old_lookup = MultiLookup::new(old_slices);
let new_lookup = MultiLookup::new(new_slices);
@ -215,7 +224,7 @@ where
0..new_lookup.len(),
);
if get_diff_ratio(&ops, old_lookup.len(), new_lookup.len()) < 0.5 {
if get_diff_ratio(&ops, old_lookup.len(), new_lookup.len()) < MIN_RATIO {
return Box::new(diff.iter_changes(op).map(|x| x.into())) as Box<dyn Iterator<Item = _>>;
}