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

Refactor Reconciler equality checks and enhance path handling

Browse source 
- Introduced a new `trueEquals` function in `trueEquals.lua` for shared value equality checks, improving consistency between `diff.lua` and `matching.lua`.
- Removed redundant equality logic from `diff.lua` and `matching.lua`, streamlining the codebase.
- Updated path handling in various test snapshots to ensure correct reference values, enhancing the accuracy of reconciliation tests.
- Implemented a post-processing step in `syncback` to fix `Rojo_Ref_*` attribute paths with correct dedup suffixes, improving path resolution.

These changes enhance the clarity and efficiency of the Reconciler's equality checks and path handling, paving the way for improved project management and user experience.
This commit is contained in:
Joe 2026-02-17 05:31:36 -06:00
parent aabbfb23b2
commit e207a398b1
14 changed files with 832 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/change_processor.rs
View file

@ -1104,7 +1104,13 @@ impl JobThreadContext {
None => (removed_stem.to_string(), None),
};
// Find siblings that share the same dedup base stem
// Find siblings that share the same dedup base stem AND extension.
// Matching by stem alone would incorrectly group across different
// middleware types (e.g., Foo.server.luau and Foo.luau have the
// same stem "Foo" but different dedup keys).
let removed_extension =
removed_fs_name.find('.').map(|i| &removed_fs_name[i + 1..]);
let Some(parent_inst) = tree.get_instance(parent_ref) else {
continue;
};
@ -1117,6 +1123,13 @@ impl JobThreadContext {
}
let sibling_fs = tree.filesystem_name_for(sibling_ref);
let sibling_stem = sibling_fs.split('.').next().unwrap_or(&sibling_fs);
let sibling_ext = sibling_fs.find('.').map(|i| &sibling_fs[i + 1..]);
// Only group siblings with the same extension (same dedup key space)
if sibling_ext != removed_extension {
continue;
}
let sibling_base = match parse_dedup_suffix(sibling_stem) {
Some((b, _)) => b,
None => sibling_stem,
@ -1130,8 +1143,7 @@ impl JobThreadContext {
continue;
}
// Determine extension from the removed instance's FS name
let extension = removed_fs_name.find('.').map(|i| &removed_fs_name[i + 1..]);
let extension = removed_extension;
// Get the parent directory path
let parent_dir = {