mirror of
https://github.com/RGBCube/dix
synced 2025-05-28 16:15:09 +00:00
fix: fix bug in old-new comp printing
This commit is contained in:
parent
859c5fd363
commit
c0e157841e
1 changed files with 32 additions and 14 deletions
44
src/diff.rs
44
src/diff.rs
|
@ -216,22 +216,40 @@ pub fn write_diffln<'a>(
|
||||||
},
|
},
|
||||||
|
|
||||||
EitherOrBoth::Both(old_comp, new_comp) => {
|
EitherOrBoth::Both(old_comp, new_comp) => {
|
||||||
if let Err(ignored) = old_comp {
|
let equal = old_comp == new_comp;
|
||||||
write!(oldacc, "{ignored}")?;
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Err(ignored) = new_comp {
|
match old_comp {
|
||||||
write!(newacc, "{ignored}")?;
|
Ok(old_comp) => {
|
||||||
}
|
write!(
|
||||||
|
oldacc,
|
||||||
if let (Ok(old_comp), Ok(new_comp)) = (old_comp, new_comp) {
|
"{old}",
|
||||||
if old_comp == new_comp {
|
old = if equal {
|
||||||
write!(oldacc, "{old}", old = old_comp.yellow())?;
|
old_comp.yellow()
|
||||||
write!(newacc, "{new}", new = new_comp.yellow())?;
|
|
||||||
} else {
|
} else {
|
||||||
write!(oldacc, "{old}", old = old_comp.red())?;
|
old_comp.red()
|
||||||
write!(newacc, "{new}", new = new_comp.green())?;
|
},
|
||||||
|
)?;
|
||||||
|
},
|
||||||
|
Err(ignored) => {
|
||||||
|
write!(oldacc, "{ignored}")?;
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
match new_comp {
|
||||||
|
Ok(new_comp) => {
|
||||||
|
write!(
|
||||||
|
newacc,
|
||||||
|
"{new}",
|
||||||
|
new = if equal {
|
||||||
|
new_comp.yellow()
|
||||||
|
} else {
|
||||||
|
new_comp.green()
|
||||||
|
},
|
||||||
|
)?;
|
||||||
|
},
|
||||||
|
Err(ignored) => {
|
||||||
|
write!(newacc, "{ignored}")?;
|
||||||
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue