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

Added support for unicode word splitting and change inline to use it

Browse source
This commit is contained in:
Armin Ronacher 2021-01-31 22:13:56 +01:00
parent d0dd42e4af
commit 0a4dd224f5
6 changed files with 66 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/text/inline.rs
View file

@ -1,9 +1,10 @@
#![cfg(feature = "inline")]
use std::{fmt, iter};
use crate::algorithms::{Algorithm, DiffOp, DiffTag};
use crate::text::{Change, ChangeTag, TextDiff};
use super::split_words;
use super::split_unicode_words;
use std::ops::Range;
@ -118,8 +119,8 @@ pub(crate) fn iter_inline_changes<'diff>(
(ChangeTag::Delete, Some(ChangeTag::Insert)) => {
let old_value = change.value();
let new_value = next_change.unwrap().value();
let old_chars = split_words(&old_value).collect::<Vec<_>>();
let new_chars = split_words(&new_value).collect::<Vec<_>>();
let old_chars = split_unicode_words(&old_value).collect::<Vec<_>>();
let new_chars = split_unicode_words(&new_value).collect::<Vec<_>>();
let old_mindex = MultiIndex::new(&old_chars, old_value);
let new_mindex = MultiIndex::new(&new_chars, new_value);
let inline_diff = TextDiff::configure()
@ -185,3 +186,18 @@ pub(crate) fn iter_inline_changes<'diff>(
})
.flatten()
}
#[test]
fn test_line_ops_inline() {
let diff = TextDiff::from_lines(
"Hello World\nsome stuff here\nsome more stuff here\n\nAha stuff here\nand more stuff",
"Stuff\nHello World\nsome amazing stuff here\nsome more stuff here\n",
);
assert_eq!(diff.newline_terminated(), true);
let changes = diff
.ops()
.iter()
.flat_map(|op| diff.iter_inline_changes(op))
.collect::<Vec<_>>();
insta::assert_debug_snapshot!(&changes);
}