sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't push empty positions when diffing lines

pull/748/head 0.60.0
Wilfred Hughes 2024-07-30 16:15:42 +07:00
parent 86612798ad
commit 1ac95534fe
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sample_files/compare.expected vendored
Unescape Escape View File

@ -23,7 +23,7 @@ sample_files/bad_combine_1.rs sample_files/bad_combine_2.rs
f5051bf7d2b8afa3a677388cbd458891 - f5051bf7d2b8afa3a677388cbd458891 -
sample_files/big_text_hunk_1.txt sample_files/big_text_hunk_2.txt sample_files/big_text_hunk_1.txt sample_files/big_text_hunk_2.txt
fd0c8912c094097f82c6b29ae66fb912 - fc26d41a5ff771670e04033b177973d2 -
sample_files/change_outer_1.el sample_files/change_outer_2.el sample_files/change_outer_1.el sample_files/change_outer_2.el
2b9334a4cc72da63bba28eff958f0038 - 2b9334a4cc72da63bba28eff958f0038 -

14
src/line_parser.rs
Unescape Escape View File

@ -199,12 +199,14 @@ pub(crate) fn change_positions(lhs_src: &str, rhs_src: &str) -> Vec<MatchedPos>
// individual words. // individual words.
if lhs_words.len() > MAX_WORDS_IN_LINE || rhs_words.len() > MAX_WORDS_IN_LINE { if lhs_words.len() > MAX_WORDS_IN_LINE || rhs_words.len() > MAX_WORDS_IN_LINE {
for lhs_pos in lhs_lp.from_region(lhs_offset, lhs_offset + lhs_part.len()) { for lhs_pos in lhs_lp.from_region(lhs_offset, lhs_offset + lhs_part.len()) {
mps.push(MatchedPos { if lhs_pos.start_col != lhs_pos.end_col {
kind: MatchKind::NovelWord { mps.push(MatchedPos {
highlight: TokenKind::Atom(AtomKind::Normal), kind: MatchKind::NovelWord {
}, highlight: TokenKind::Atom(AtomKind::Normal),
pos: lhs_pos, },
}); pos: lhs_pos,
});
}
} }
lhs_offset += lhs_part.len(); lhs_offset += lhs_part.len();