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

Use the max opposite line when computing after context 

Previously we'd use the maximum line of the current side, leading us
to try to access nonexistent line numbers. This occurred when diffing
old/new.jsx from sample_files/.
pull/70/head
Wilfred Hughes 2021-11-14 22:23:51 +07:00
parent a5965b8292
commit 9d8d37957f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/context.rs
Unescape Escape View File

@ -142,7 +142,7 @@ fn after_with_opposites(
after_lines: &[LineNumber], after_lines: &[LineNumber],
opposite_lines: HashMap<LineNumber, HashSet<LineNumber>>, opposite_lines: HashMap<LineNumber, HashSet<LineNumber>>,
prev_max_opposite: Option<LineNumber>, prev_max_opposite: Option<LineNumber>,
max_line: LineNumber, max_opposite: LineNumber,
) -> Vec<(Option<LineNumber>, Option<LineNumber>)> { ) -> Vec<(Option<LineNumber>, Option<LineNumber>)> {
let mut prev_opposite: Option<LineNumber> = None; let mut prev_opposite: Option<LineNumber> = None;
let mut res: Vec<(Option<LineNumber>, Option<LineNumber>)> = vec![]; let mut res: Vec<(Option<LineNumber>, Option<LineNumber>)> = vec![];
@ -150,7 +150,7 @@ fn after_with_opposites(
for line in after_lines { for line in after_lines {
let current_opposite: Option<LineNumber> = match prev_opposite { let current_opposite: Option<LineNumber> = match prev_opposite {
Some(prev_opposite) => { Some(prev_opposite) => {
if prev_opposite < max_line { if prev_opposite < max_opposite {
Some((prev_opposite.0 + 1).into()) Some((prev_opposite.0 + 1).into())
} else { } else {
None None
@ -227,7 +227,7 @@ pub fn calculate_context(
&padded_lines, &padded_lines,
opposite_to_lhs, opposite_to_lhs,
max_opposite, max_opposite,
max_lhs_src_line, max_rhs_src_line,
) )
} }
(_, Some(rhs_line)) => { (_, Some(rhs_line)) => {
@ -243,7 +243,7 @@ pub fn calculate_context(
&padded_lines, &padded_lines,
opposite_to_rhs, opposite_to_rhs,
max_opposite, max_opposite,
max_rhs_src_line, max_lhs_src_line,
)) ))
} }
(None, None) => return (vec![], vec![]), (None, None) => return (vec![], vec![]),