1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
//! Layout tree nodes.
use std::borrow::Cow;
use indextree::{Arena, NodeId};
use super::{Attr, ChangedGroup, FormatArena, FormattedValue};
/// How an element changed (affects its prefix and color).
#[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
pub enum ElementChange {
/// No change to the element itself (may have changed children/attrs)
#[default]
None,
/// Element was deleted (- prefix, red)
Deleted,
/// Element was inserted (+ prefix, green)
Inserted,
/// Element was moved from this position (← prefix, blue)
MovedFrom,
/// Element was moved to this position (→ prefix, blue)
MovedTo,
}
impl ElementChange {
/// Get the prefix character for this change type.
pub const fn prefix(self) -> Option<char> {
match self {
Self::None => None,
Self::Deleted => Some('-'),
Self::Inserted => Some('+'),
Self::MovedFrom => Some('←'),
Self::MovedTo => Some('→'),
}
}
/// Check if this change type uses any prefix.
pub const fn has_prefix(self) -> bool {
!matches!(self, Self::None)
}
}
/// A node in the layout tree.
#[derive(Clone, Debug)]
pub enum LayoutNode {
/// An element/struct with attributes and children.
Element {
/// Element tag name
tag: Cow<'static, str>,
/// Field name if this element is a struct field (e.g., "point" for `point: Inner`)
field_name: Option<&'static str>,
/// All attributes (unchanged, changed, deleted, inserted)
attrs: Vec<Attr>,
/// Changed attributes grouped for -/+ line alignment
changed_groups: Vec<ChangedGroup>,
/// How this element itself changed
change: ElementChange,
},
/// A sequence/array with children.
Sequence {
/// How this sequence itself changed
change: ElementChange,
/// The type name of items in this sequence (e.g., "i32", "Item")
item_type: &'static str,
/// Field name if this sequence is a struct field value (e.g., "elements" for `elements: [...]`)
field_name: Option<&'static str>,
},
/// A tuple / tuple-struct / tuple-enum-variant, rendered paren-style:
/// `Tag( a, b → c )` on one line when it fits, else one element per
/// line. Children are the positional elements (built like a
/// sequence). No `N:` labels.
Tuple {
/// Type/variant name (`Point`, `Failed`); empty for anonymous
/// tuples like `(u32, u32)`.
tag: Cow<'static, str>,
/// Field name if this tuple is a struct field value.
field_name: Option<&'static str>,
/// How this tuple itself changed.
change: ElementChange,
},
/// A collapsed run of unchanged siblings.
Collapsed {
/// Number of collapsed elements
count: usize,
/// Names of the collapsed fields/keys, if known (empty for
/// sequences, where elements have no names). When present they
/// are listed (`.. a, b unchanged`) like the Display path.
names: Vec<Cow<'static, str>>,
},
/// Text content.
Text {
/// Formatted text value
value: FormattedValue,
/// How this text changed
change: ElementChange,
/// Field name if this text is a struct field value (e.g. `state`
/// for a unit enum variant `state: Idle`). Keeps deleted/inserted
/// scalar values labelled, symmetric with Element.
field_name: Option<&'static str>,
},
/// An inline scalar value change rendered as `[name: ]old → new`
/// (only old/new highlighted). Used for any `Diff::Replace` that
/// isn't a structural change — tuple slots, sequence elements,
/// top-level scalars, etc.
ValueChange {
/// Field/label name if known (set by the parent struct/seq).
field_name: Option<&'static str>,
/// The old value.
old: FormattedValue,
/// The new value.
new: FormattedValue,
},
/// A byte-level hex-dump diff block (pre-classified per byte).
HexDump {
/// Optional struct-field label (e.g. `payload`) shown before the block.
field_name: Option<&'static str>,
/// The classified hex-dump lines to render.
lines: Vec<crate::hexdump::HexLine>,
},
/// A group of items rendered on a single line (for sequences).
/// Used to group consecutive unchanged/deleted/inserted items.
ItemGroup {
/// Formatted values for each visible item in the group.
items: Vec<FormattedValue>,
/// How these items changed (all have the same change type).
change: ElementChange,
/// Number of additional collapsed items (shown as "...N more").
/// None means all items are visible.
collapsed_suffix: Option<usize>,
/// The type name of items (e.g., "i32", "Item") for XML wrapping.
item_type: &'static str,
},
}
impl LayoutNode {
/// Create an element node with no changes.
pub fn element(tag: impl Into<Cow<'static, str>>) -> Self {
Self::Element {
tag: tag.into(),
field_name: None,
attrs: Vec::new(),
changed_groups: Vec::new(),
change: ElementChange::None,
}
}
/// Create an element node with a specific change type.
pub fn element_with_change(tag: impl Into<Cow<'static, str>>, change: ElementChange) -> Self {
Self::Element {
tag: tag.into(),
field_name: None,
attrs: Vec::new(),
changed_groups: Vec::new(),
change,
}
}
/// Create a sequence node.
pub const fn sequence(change: ElementChange, item_type: &'static str) -> Self {
Self::Sequence {
change,
item_type,
field_name: None,
}
}
/// Create a collapsed node with just a count (no names — sequences).
pub const fn collapsed(count: usize) -> Self {
Self::Collapsed {
count,
names: Vec::new(),
}
}
/// Create a collapsed node that knows the names of what it hid.
pub fn collapsed_named(names: Vec<Cow<'static, str>>) -> Self {
Self::Collapsed {
count: names.len(),
names,
}
}
/// Create a text node.
pub const fn text(value: FormattedValue, change: ElementChange) -> Self {
Self::Text {
value,
change,
field_name: None,
}
}
/// Create an item group node.
pub const fn item_group(
items: Vec<FormattedValue>,
change: ElementChange,
collapsed_suffix: Option<usize>,
item_type: &'static str,
) -> Self {
Self::ItemGroup {
items,
change,
collapsed_suffix,
item_type,
}
}
/// Get the element change type (if applicable).
pub const fn change(&self) -> ElementChange {
match self {
Self::Element { change, .. } => *change,
Self::Sequence { change, .. } => *change,
Self::Collapsed { .. } => ElementChange::None,
Self::Text { change, .. } => *change,
Self::Tuple { change, .. } => *change,
Self::HexDump { .. } => ElementChange::None,
Self::ValueChange { .. } => ElementChange::None,
Self::ItemGroup { change, .. } => *change,
}
}
/// Check if this node has any actual changes to render.
pub fn has_changes(&self) -> bool {
match self {
Self::Element {
attrs,
change,
changed_groups,
..
} => {
change.has_prefix()
|| !changed_groups.is_empty()
|| attrs.iter().any(|a| {
matches!(
a.status,
super::AttrStatus::Changed { .. }
| super::AttrStatus::Deleted { .. }
| super::AttrStatus::Inserted { .. }
)
})
}
Self::Sequence { change, .. } => change.has_prefix(),
Self::Collapsed { .. } => false,
Self::Text { change, .. } => change.has_prefix(),
Self::Tuple { .. } => true,
Self::HexDump { lines, .. } => !lines.is_empty(),
Self::ValueChange { .. } => true,
Self::ItemGroup { change, .. } => change.has_prefix(),
}
}
}
/// The complete layout ready for rendering.
pub struct Layout {
/// Formatted strings arena
pub strings: FormatArena,
/// Tree of layout nodes
pub tree: Arena<LayoutNode>,
/// Root node ID
pub root: NodeId,
}
impl Layout {
/// Create a new layout with the given root node.
pub fn new(strings: FormatArena, mut tree: Arena<LayoutNode>, root_node: LayoutNode) -> Self {
let root = tree.new_node(root_node);
Self {
strings,
tree,
root,
}
}
/// Get a reference to a node by ID.
pub fn get(&self, id: NodeId) -> Option<&LayoutNode> {
self.tree.get(id).map(|n| n.get())
}
/// Get a mutable reference to a node by ID.
pub fn get_mut(&mut self, id: NodeId) -> Option<&mut LayoutNode> {
self.tree.get_mut(id).map(|n| n.get_mut())
}
/// Add a child to a parent node.
pub fn add_child(&mut self, parent: NodeId, child_node: LayoutNode) -> NodeId {
let child = self.tree.new_node(child_node);
parent.append(child, &mut self.tree);
child
}
/// Iterate over children of a node.
pub fn children(&self, parent: NodeId) -> impl Iterator<Item = NodeId> + '_ {
parent.children(&self.tree)
}
/// Get the string for a span from the arena.
pub fn get_string(&self, span: super::Span) -> &str {
self.strings.get(span)
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn test_element_change_prefix() {
assert_eq!(ElementChange::None.prefix(), None);
assert_eq!(ElementChange::Deleted.prefix(), Some('-'));
assert_eq!(ElementChange::Inserted.prefix(), Some('+'));
assert_eq!(ElementChange::MovedFrom.prefix(), Some('←'));
assert_eq!(ElementChange::MovedTo.prefix(), Some('→'));
}
#[test]
fn test_layout_tree() {
let arena = FormatArena::new();
let tree = Arena::new();
let mut layout = Layout::new(arena, tree, LayoutNode::element("root"));
let child1 = layout.add_child(layout.root, LayoutNode::element("child1"));
let child2 = layout.add_child(layout.root, LayoutNode::element("child2"));
let children: Vec<_> = layout.children(layout.root).collect();
assert_eq!(children.len(), 2);
assert_eq!(children[0], child1);
assert_eq!(children[1], child2);
}
#[test]
fn test_collapsed_node() {
let node = LayoutNode::collapsed(5);
assert!(!node.has_changes());
if let LayoutNode::Collapsed { count, .. } = node {
assert_eq!(count, 5);
} else {
panic!("expected Collapsed node");
}
}
}