Skip to content
This repository was archived by the owner on Dec 29, 2021. It is now read-only.

fix panic on diff when addind new first line #113

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 38 additions & 20 deletions src/diff.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,33 @@ pub fn render(&Changeset { ref diffs, .. }: &Changeset) -> Result<String, fmtErr
writeln!(t, "{}", format!("-{}", x).red())?;
}
Difference::Add(ref x) => {
match diffs[i - 1] {
Difference::Rem(ref y) => {
write!(t, "{}", "+".green())?;
let Changeset { diffs, .. } = Changeset::new(y, x, " ");
for c in diffs {
match c {
Difference::Same(ref z) if !z.is_empty() => {
write!(t, "{}", z.green())?;
write!(t, " ")?;
if i == 0 {
writeln!(t, "{}", format!("+{}", x).green())?;
} else {
match diffs[i - 1] {
Difference::Rem(ref y) => {
write!(t, "{}", "+".green())?;
let Changeset { diffs, .. } = Changeset::new(y, x, " ");
for c in diffs {
match c {
Difference::Same(ref z) if !z.is_empty() => {
write!(t, "{}", z.green())?;
write!(t, " ")?;
}
Difference::Add(ref z) if !z.is_empty() => {
write!(t, "{}", z.green().reverse())?;
write!(t, " ")?;
}
_ => (),
}
Difference::Add(ref z) if !z.is_empty() => {
write!(t, "{}", z.green().reverse())?;
write!(t, " ")?;
}
_ => (),
}
writeln!(t, "")?;
}
_ => {
writeln!(t, "{}", format!("+{}", x).green().dimmed())?;
}
writeln!(t, "")?;
}
_ => {
writeln!(t, "{}", format!("+{}", x).green().dimmed())?;
}
};
};
}
}
}
}
Expand Down Expand Up @@ -84,4 +88,18 @@ ullamco laboris nisi ut aliquip ex ea commodo consequat.",
commodo consequat.\n"
);
}

#[test]
fn added_first_line_diff() {
let diff = Changeset::new(
"Line 1\nLine 2\nLine 3",
"Line 0\nLine 1\nLine 2\nLine 3",
"\n",
);
println!("{}", render(&diff).unwrap());
assert_eq!(
render(&diff).unwrap(),
"\u{1b}[32m+Line 0\u{1b}[0m\n Line 1\nLine 2\nLine 3\n"
);
}
}