Add an opt-in detailed text diff
This commit is contained in:
parent
ab308f7b7f
commit
f3275fc161
1 changed files with 266 additions and 45 deletions
|
|
@ -426,6 +426,23 @@ impl ShownReferences {
|
|||
self.row_start = row_start;
|
||||
}
|
||||
|
||||
pub fn individual(
|
||||
&mut self,
|
||||
object: &ObjectChange,
|
||||
removed: bool,
|
||||
count: usize,
|
||||
row_start: usize,
|
||||
) {
|
||||
let placements = if removed {
|
||||
&mut self.removed
|
||||
} else {
|
||||
&mut self.added
|
||||
};
|
||||
*placements += reference_placements(object) * count as u128;
|
||||
self.shown += count;
|
||||
self.row_start = row_start;
|
||||
}
|
||||
|
||||
pub fn count_change(&mut self) {
|
||||
self.total += 1;
|
||||
}
|
||||
|
|
@ -555,6 +572,28 @@ fn polygon_replacement(old: &ObjectChange, new: &ObjectChange) -> String {
|
|||
out
|
||||
}
|
||||
|
||||
pub(super) fn replacement_heading(old: &ObjectChange, new: &ObjectChange) -> String {
|
||||
let rectangular = is_polygon(old.kind)
|
||||
&& rectangle_size(object_xy(old)).is_some()
|
||||
&& rectangle_size(object_xy(new)).is_some();
|
||||
let mut heading = object_heading(old, object_name(old.kind, rectangular));
|
||||
if let Some(target) = &old.target {
|
||||
write!(heading, " {target:?}").unwrap();
|
||||
}
|
||||
heading
|
||||
}
|
||||
|
||||
pub(super) fn write_replacement_objects(out: &mut String, old: &ObjectChange, new: &ObjectChange) {
|
||||
for (sign, object) in [('-', old), ('+', new)] {
|
||||
let description = object.to_string();
|
||||
let mut lines = description.split('\n');
|
||||
writeln!(out, " {sign} {}", lines.next().unwrap()).unwrap();
|
||||
for line in lines {
|
||||
writeln!(out, " {line}").unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn replacement_summary(old: &ObjectChange, new: &ObjectChange) -> String {
|
||||
if old.layer != new.layer && old.layer.is_some() && new.layer.is_some() {
|
||||
let mut out = String::new();
|
||||
|
|
@ -565,11 +604,7 @@ pub(super) fn replacement_summary(old: &ObjectChange, new: &ObjectChange) -> Str
|
|||
let mut out = if polygon {
|
||||
polygon_replacement(old, new)
|
||||
} else {
|
||||
let mut heading = object_heading(old, object_name(old.kind, false));
|
||||
if let Some(target) = &old.target {
|
||||
write!(heading, " {target:?}").unwrap();
|
||||
}
|
||||
heading
|
||||
replacement_heading(old, new)
|
||||
};
|
||||
|
||||
let mut separator = if polygon { "\n " } else { " " };
|
||||
|
|
|
|||
Loading…
Reference in a new issue