Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(merge): Hoist merge of terminals into main function #18

Merged
merged 2 commits into from
Nov 23, 2023
+247 −222
Merged

refactor(merge): Hoist merge of terminals into main function #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65c5eb1
refactor(merge): Hoist merge of terminals into main function
jpedroh Nov 23, 2023
5aa3ed2
refactor(merge): Move merge function to a separate file
jpedroh Nov 23, 2023
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
32 changes: 2 additions & 30 deletions merge/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,10 @@
mod merge;
mod merged_cst_node;
mod ordered_merge;
mod unordered_merge;

use matching::Matchings;
use merged_cst_node::MergedCSTNode;
use model::CSTNode;
use ordered_merge::ordered_merge;
use unordered_merge::unordered_merge;

pub fn merge<'a>(
base: &'a CSTNode<'a>,
left: &'a CSTNode<'a>,
right: &'a CSTNode<'a>,
base_left_matchings: &'a Matchings<'a>,
base_right_matchings: &'a Matchings<'a>,
left_right_matchings: &'a Matchings<'a>,
) -> MergedCSTNode<'a> {
if right.are_children_unordered() && left.are_children_unordered() {
unordered_merge(
base,
left,
right,
base_left_matchings,
base_right_matchings,
left_right_matchings,
)
} else {
ordered_merge(
base,
left,
right,
base_left_matchings,
base_right_matchings,
left_right_matchings,
)
}
}
pub use merge::merge;
244 changes: 244 additions & 0 deletions merge/src/merge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,244 @@
use crate::ordered_merge;
use crate::unordered_merge;
use matching::Matchings;
use model::CSTNode;

use crate::merged_cst_node::MergedCSTNode;

pub fn merge<'a>(
base: &'a CSTNode<'a>,
left: &'a CSTNode<'a>,
right: &'a CSTNode<'a>,
base_left_matchings: &'a Matchings<'a>,
base_right_matchings: &'a Matchings<'a>,
left_right_matchings: &'a Matchings<'a>,
) -> MergedCSTNode<'a> {
match (base, left, right) {
(
CSTNode::Terminal {
kind,
value: value_base,
..
},
CSTNode::Terminal {
value: value_left, ..
},
CSTNode::Terminal {
value: value_right, ..
},
) => {
// Unchanged
if value_left == value_base && value_right == value_base {
base.to_owned().into()
// Changed in both
} else if value_left != value_base && value_right != value_base {
match diffy::merge(value_base, value_left, value_right) {
Ok(value) => MergedCSTNode::Terminal { kind, value },
Err(value) => MergedCSTNode::Terminal { kind, value },
}
// Only left changed
} else if value_left != value_base {
left.to_owned().into()
// Only right changed
} else {
right.to_owned().into()
}
}
(CSTNode::NonTerminal { .. }, CSTNode::NonTerminal { .. }, CSTNode::NonTerminal { .. }) => {
if right.are_children_unordered() && left.are_children_unordered() {
unordered_merge(
base,
left,
right,
base_left_matchings,
base_right_matchings,
left_right_matchings,
)
} else {
ordered_merge(
base,
left,
right,
base_left_matchings,
base_right_matchings,
left_right_matchings,
)
}
}
(_, _, _) => panic!("Can not merge Terminal with Non-Terminal"),
}
}

#[cfg(test)]
mod tests {
use std::vec;

use matching::{ordered_tree_matching, Matchings};
use model::{CSTNode, Point};

use crate::MergedCSTNode;

use super::merge;

fn assert_merge_is_correct_and_idempotent_with_respect_to_parent_side(
base: &CSTNode,
parent_a: &CSTNode,
parent_b: &CSTNode,
expected_merge: &MergedCSTNode,
) {
let matchings_base_parent_a = ordered_tree_matching(base, parent_a);
let matchings_base_parent_b = ordered_tree_matching(base, parent_b);
let matchings_parents = ordered_tree_matching(parent_a, parent_b);

let merged_tree = merge(
base,
parent_a,
parent_b,
&matchings_base_parent_a,
&matchings_base_parent_b,
&matchings_parents,
);
let merged_tree_swap = merge(
base,
parent_b,
parent_a,
&matchings_base_parent_b,
&matchings_base_parent_a,
&matchings_parents,
);

assert_eq!(expected_merge, &merged_tree);
assert_eq!(expected_merge, &merged_tree_swap)
}

#[test]
fn if_i_am_merging_three_unchanged_nodes_it_is_a_success() {
let node = CSTNode::Terminal {
kind: "kind",
start_position: Point { row: 0, column: 0 },
end_position: Point { row: 0, column: 7 },
value: "value",
};

assert_merge_is_correct_and_idempotent_with_respect_to_parent_side(
&node,
&node,
&node,
&node.clone().into(),
)
}

#[test]
fn returns_success_if_there_are_changes_in_both_parents_and_they_are_not_conflicting() {
let base = CSTNode::Terminal {
kind: "kind",
start_position: Point { row: 0, column: 0 },
end_position: Point { row: 0, column: 7 },
value: "\nvalue\n",
};
let left = CSTNode::Terminal {
kind: "kind",
start_position: Point { row: 0, column: 0 },
end_position: Point { row: 0, column: 7 },
value: "left\nvalue\n",
};
let right = CSTNode::Terminal {
kind: "kind",
start_position: Point { row: 0, column: 0 },
end_position: Point { row: 0, column: 7 },
value: "\nvalue\nright",
};

assert_merge_is_correct_and_idempotent_with_respect_to_parent_side(
&base,
&left,
&right,
&MergedCSTNode::Terminal {
kind: "kind",
value: "left\nvalue\nright".to_string(),
},
)
}

#[test]
fn returns_conflict_if_there_are_changes_in_both_parents_and_they_are_conflicting() {
let base = CSTNode::Terminal {
kind: "kind",
start_position: Point { row: 0, column: 0 },
end_position: Point { row: 0, column: 7 },
value: "value",
};
let left = CSTNode::Terminal {
kind: "kind",
start_position: Point { row: 0, column: 0 },
end_position: Point { row: 0, column: 7 },
value: "left_value",
};
let right = CSTNode::Terminal {
kind: "kind",
start_position: Point { row: 0, column: 0 },
end_position: Point { row: 0, column: 7 },
value: "right_value",
};

assert_eq!(
merge(&base, &left, &right, &Matchings::empty(), &Matchings::empty(),
&Matchings::empty()),
MergedCSTNode::Terminal {
kind: "kind",
value: "<<<<<<< ours\nleft_value||||||| original\nvalue=======\nright_value>>>>>>> theirs\n".to_string()
}
)
}

#[test]
fn if_there_is_a_change_only_in_one_parent_it_returns_the_changes_from_this_parent() {
let base_and_left = CSTNode::Terminal {
kind: "kind",
start_position: Point { row: 0, column: 0 },
end_position: Point { row: 0, column: 7 },
value: "value",
};
let changed_parent = CSTNode::Terminal {
kind: "kind",
start_position: Point { row: 0, column: 0 },
end_position: Point { row: 0, column: 7 },
value: "value_right",
};

assert_merge_is_correct_and_idempotent_with_respect_to_parent_side(
&base_and_left,
&base_and_left,
&changed_parent,
&changed_parent.clone().into(),
)
}

#[test]
#[should_panic(expected = "Can not merge Terminal with Non-Terminal")]
fn test_can_not_merge_terminal_with_non_terminal() {
merge(
&CSTNode::Terminal {
kind: "kind",
start_position: Point { row: 0, column: 0 },
end_position: Point { row: 0, column: 7 },
value: "value",
},
&CSTNode::Terminal {
kind: "kind",
start_position: Point { row: 0, column: 0 },
end_position: Point { row: 0, column: 7 },
value: "value",
},
&CSTNode::NonTerminal {
kind: "kind",
start_position: Point { row: 0, column: 0 },
end_position: Point { row: 0, column: 7 },
children: vec![],
},
&Matchings::empty(),
&Matchings::empty(),
&Matchings::empty(),
);
}
}
Loading
Loading