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 snapshot attribute handling in patch computation

Browse source 
- Removed redundant Rojo reference attributes from snapshot comparisons to prevent spurious diffs during VFS events.
- Updated the logic for interned instance additions to ensure deterministic ordering by redacted parent and name.

These changes aim to improve the accuracy of snapshot comparisons and enhance the handling of interned instances.
This commit is contained in:
Joe 2026-02-19 07:33:32 -06:00
parent c47e568cd4
commit eb114ac76e
7 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

25
tests/rojo_test/internable.rs
View file

@ -104,19 +104,22 @@ fn intern_instance_additions(
for (id, added) in additions {
let parent_id = added.parent;
let parent_redacted = redactions.get_redacted_value(parent_id);
// Here, we assume that instances are only added to other instances that
// we've already interned. If that's not true, then we'll have some
// dangling unredacted IDs.
if let Some(parent_redacted) = parent_redacted {
added_roots.push((id, parent_redacted));
}
let parent_redacted = match redactions.get_redacted_value(parent_id) {
Some(v) => v,
None => {
redactions.intern(parent_id);
redactions.get_redacted_value(parent_id).unwrap()
}
};
added_roots.push((id, parent_redacted));
}
// Sort the input by the redacted key, which should match the traversal
// order we need for the tree.
added_roots.sort_unstable_by(|a, b| a.1.cmp(&b.1));
// Sort by redacted parent, then by name for deterministic ordering when
// multiple children share the same parent.
added_roots.sort_unstable_by(|a, b| {
a.1.cmp(&b.1)
.then_with(|| additions[a.0].name.cmp(&additions[b.0].name))
});
for (root_id, _redacted_id) in added_roots {
additions[root_id].intern(redactions, additions);