hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-23 05:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor matching logic for improved readability and consistency

Browse source 
- Simplified function calls in `Reconciler/matching.lua` by consolidating multi-line arguments into single lines, enhancing code clarity.
- Updated `matching.rs` to improve formatting of method calls and assertions, ensuring a more consistent style throughout the test suite.
- Enhanced the `matching_fixtures.rs` file by streamlining the loading of input data and improving the readability of child copying logic.

These changes contribute to a cleaner and more maintainable codebase, facilitating easier future modifications.
This commit is contained in:
Joe 2026-02-17 18:38:09 -06:00
parent 21b3ee45fd
commit 6ef81cf8e0
3 changed files with 28 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

27
tests/tests/matching_fixtures.rs
View file

@ -26,7 +26,8 @@ fn load_input_rbxm() -> WeakDom {
let path = Path::new(SYNCBACK_TESTS_PATH)
.join(FIXTURE_DIR)
.join("input.rbxm");
let data = std::fs::read(&path).unwrap_or_else(|e| panic!("Failed to read {}: {}", path.display(), e));
let data =
std::fs::read(&path).unwrap_or_else(|e| panic!("Failed to read {}: {}", path.display(), e));
rbx_binary::from_reader(data.as_slice())
.unwrap_or_else(|e| panic!("Failed to parse {}: {}", path.display(), e))
}
@ -69,12 +70,13 @@ fn rojo_tree_to_weak_dom(tree: &librojo::RojoTree) -> WeakDom {
}
// Recursively copy children
fn copy_children(tree: &librojo::RojoTree, parent_ref: Ref, dom: &mut WeakDom, dom_parent: Ref) {
let children: Vec<Ref> = tree
.get_instance(parent_ref)
.unwrap()
.children()
.to_vec();
fn copy_children(
tree: &librojo::RojoTree,
parent_ref: Ref,
dom: &mut WeakDom,
dom_parent: Ref,
) {
let children: Vec<Ref> = tree.get_instance(parent_ref).unwrap().children().to_vec();
for child_ref in children {
let child = tree.get_instance(child_ref).unwrap();
let builder = rbx_dom_weak::InstanceBuilder::new(child.class_name().as_str())
@ -224,7 +226,8 @@ fn syncback_matching_ufowave_textures() {
let effective_old_face = old_face.or(Some(5));
assert_eq!(
new_face, effective_old_face,
new_face,
effective_old_face,
"Face mismatch: input {:?} (name={}) matched to expected {:?} (name={})",
new_face,
input_dom.get_by_ref(*new_ref).unwrap().name,
@ -303,8 +306,7 @@ fn forward_matching_ufowave_textures() {
assert!(!snap_textures.is_empty(), "No Texture children found");
// Run forward sync matching
let result =
librojo::snapshot::matching::match_forward(snap_textures, &tree_textures, &tree);
let result = librojo::snapshot::matching::match_forward(snap_textures, &tree_textures, &tree);
assert_eq!(
result.matched.len(),
@ -344,10 +346,7 @@ fn forward_matching_ufowave_textures() {
// Both omitted: both at default, fine
}
(Some(sv), None) => {
panic!(
"Snap has Face={:?} but tree has none",
sv
);
panic!("Snap has Face={:?} but tree has none", sv);
}
}
}