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

Factor out a helper function for splitting unchanged singleton lists

pull/185/head
Wilfred Hughes 2022-03-24 21:20:46 +07:00
parent 870806c017
commit 807be70e31
1 changed files with 50 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
src/unchanged.rs
Unescape Escape View File

@ -65,6 +65,46 @@ fn split_unchanged<'a>(
res
}
fn split_unchanged_singleton_list<'a>(
lhs_nodes: &[&'a Syntax<'a>],
rhs_nodes: &[&'a Syntax<'a>],
size_threshold: u32,
) -> Vec<(ChangeState, Vec<&'a Syntax<'a>>, Vec<&'a Syntax<'a>>)> {
let mut res: Vec<(ChangeState, Vec<&'a Syntax<'a>>, Vec<&'a Syntax<'a>>)> = vec![];
match as_singleton_list_children(lhs_nodes, rhs_nodes) {
Some((lhs_children, rhs_children)) => {
let mut split_children =
split_unchanged_toplevel(&lhs_children, &rhs_children, size_threshold);
if split_children.len() > 1 {
res.push((
ChangeState::UnchangedDelimiter,
lhs_nodes.to_vec(),
rhs_nodes.to_vec(),
));
// Managed to further split.
res.append(&mut split_children);
} else {
// Did not split further. Keep the outer list, so we can use
// its delimiter when doing the tree diff.
res.push((
ChangeState::PossiblyChanged,
lhs_nodes.to_vec(),
rhs_nodes.to_vec(),
));
}
}
None => {
res.push((
ChangeState::PossiblyChanged,
lhs_nodes.to_vec(),
rhs_nodes.to_vec(),
));
}
}
res
}
/// Mark top-level nodes as unchanged if they have exactly the same
/// content on both sides.
fn split_unchanged_toplevel<'a>(
@ -111,40 +151,11 @@ fn split_unchanged_toplevel<'a>(
section_rhs_nodes.push(rhs_node);
} else {
if !section_lhs_nodes.is_empty() || !section_rhs_nodes.is_empty() {
match as_singleton_list_children(&section_lhs_nodes, &section_rhs_nodes) {
Some((lhs_children, rhs_children)) => {
let mut split_children = split_unchanged_toplevel(
&lhs_children,
&rhs_children,
size_threshold,
);
if split_children.len() > 1 {
res.push((
ChangeState::UnchangedDelimiter,
section_lhs_nodes,
section_rhs_nodes,
));
// Managed to further split.
res.append(&mut split_children);
} else {
// Did not split further. Keep the outer list, so we can use
// its delimiter when doing the tree diff.
res.push((
ChangeState::PossiblyChanged,
section_lhs_nodes,
section_rhs_nodes,
));
}
}
None => {
res.push((
ChangeState::PossiblyChanged,
section_lhs_nodes,
section_rhs_nodes,
));
}
}
res.extend(split_unchanged_singleton_list(
&section_lhs_nodes,
&section_rhs_nodes,
size_threshold,
));
section_lhs_nodes = vec![];
section_rhs_nodes = vec![];
}
@ -162,37 +173,11 @@ fn split_unchanged_toplevel<'a>(
}
if !section_lhs_nodes.is_empty() || !section_rhs_nodes.is_empty() {
// TODO: there's a lot of duplication with the loop above.
match as_singleton_list_children(&section_lhs_nodes, &section_rhs_nodes) {
Some((lhs_children, rhs_children)) => {
let mut split_children =
split_unchanged_toplevel(&lhs_children, &rhs_children, size_threshold);
if split_children.len() > 1 {
res.push((
ChangeState::UnchangedDelimiter,
section_lhs_nodes,
section_rhs_nodes,
));
// Managed to further split.
res.append(&mut split_children);
} else {
// Did not split further. Keep the outer list, so we can use
// its delimiter when doing the tree diff.
res.push((
ChangeState::PossiblyChanged,
section_lhs_nodes,
section_rhs_nodes,
));
}
}
None => {
res.push((
ChangeState::PossiblyChanged,
section_lhs_nodes,
section_rhs_nodes,
));
}
}
res.extend(split_unchanged_singleton_list(
&section_lhs_nodes,
&section_rhs_nodes,
size_threshold,
));
}
res