diffr-core 0.1.16

The diffr engine: parsing, structural diffing, configuration and the plugin cursor.
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

use super::*;
use crate::protocol::{FileRef, FileStatus};

/// A test side's root. Its id stays clear of the regions' ids and differs
/// between sides, which never share region ids.
pub(crate) fn test_root(regions: Vec<Region>) -> Region {
    let id = 1000 + regions.iter().map(|region| region.id).min().unwrap_or(0);
    Region::root(id, regions)
}

fn data(view: RegionView) -> RegionView {
    view
}

fn entry(sides: Pairing<FileRef>) -> FileChange {
    FileChange {
        file: sides,
        status: FileStatus::Modified,
        tags: vec![],
    }
}

fn file_ref() -> FileRef {
    FileRef {
        path: "a.rs".into(),
        oid: String::new(),
        mode: "100644".into(),
    }
}

/// The new region on the first side that has one.
fn first(ids: &RegionIds) -> u32 {
    match *ids {
        RegionIds::Both(lhs, _) | RegionIds::LeftOnly(lhs) => lhs,
        RegionIds::RightOnly(rhs) => rhs,
    }
}

/// A cursor over `sides`, with a manifest entry naming the same sides.
fn cursor(sides: Pairing<Source>) -> Cursor {
    let file = match &sides {
        Pairing::Both { .. } => Pairing::Both {
            lhs: file_ref(),
            rhs: file_ref(),
        },
        Pairing::LeftOnly { .. } => Pairing::LeftOnly { lhs: file_ref() },
        Pairing::RightOnly { .. } => Pairing::RightOnly { rhs: file_ref() },
    };
    Cursor::new(entry(file), sides).expect("a region")
}

fn leaf(id: u32, alignment: u32, start: u32, end: u32) -> Region {
    Region {
        id,
        fold_state_id: alignment,
        range: SourceRange {
            start: SourcePos {
                line: start,
                column: 0,
            },
            end: SourcePos {
                line: end,
                column: 0,
            },
        },
        tags: vec![],
        visibility: Visibility::default(),
        node: Node::Leaf {
            alignment_id: alignment,
            changed: vec![],
        },
    }
}
fn source(regions: Vec<Region>) -> Source {
    Source {
        text: "a\nb\nc\nd\n".into(),
        syntax: Vec::new(),
        root: test_root(regions),
    }
}
fn file_state() -> Cursor {
    let fold = Region {
        node: Node::Fold {
            children: vec![leaf(2, 1, 0, 4)],
            indent: SourcePos { line: 0, column: 0 },
            syntax: None,
        },
        ..leaf(1, 10, 0, 4)
    };
    cursor(Pairing::Both {
        lhs: source(vec![fold]),
        rhs: source(vec![leaf(3, 1, 0, 4)]),
    })
}

#[test]
fn source_is_original_text_and_distinguishes_absent_from_empty() {
    for side in [Side::Lhs, Side::Rhs] {
        for text in ["a", "a\n", "Ï€\r\nlast"] {
            let source = Source {
                text: text.into(),
                syntax: Vec::new(),
                root: test_root(vec![leaf(1, 1, 0, 1)]),
            };
            let sides = match side {
                Side::Lhs => Pairing::LeftOnly { lhs: source },
                Side::Rhs => Pairing::RightOnly { rhs: source },
            };
            let mut state = cursor(sides);
            let c = &mut state;
            let other = match side {
                Side::Lhs => Side::Rhs,
                Side::Rhs => Side::Lhs,
            };
            assert_eq!(c.source(other), None);
            assert_eq!(c.source(side), Some(text.into()));
        }
    }
    let mut state = file_state();
    let c = &mut state;
    let original = c.source(Side::Lhs);
    let pieces = c.cut(2, 1).unwrap();
    c.join(&[2, first(&pieces)]).unwrap();
    assert_eq!(c.source(Side::Lhs), original);
}

#[test]
fn returned_ids_preserve_the_side_for_one_sided_edits() {
    for lhs in [true, false] {
        let side = source(vec![leaf(7, 7, 0, 4)]);
        let sides = if lhs {
            Pairing::LeftOnly { lhs: side }
        } else {
            Pairing::RightOnly { rhs: side }
        };
        let mut state = cursor(sides);
        let c = &mut state;
        let ids = c.cut(7, 2).unwrap();
        assert_eq!(matches!(ids, RegionIds::LeftOnly(_)), lhs);
        let new = first(&ids);
        let folds = c.join(&[7, new]).unwrap();
        assert_eq!(matches!(folds, RegionIds::LeftOnly(_)), lhs);
        assert_eq!(c.get(first(&folds)).unwrap().children, vec![7, new]);
    }
}

#[test]
fn relationships_follow_edits_without_confusing_linking_with_alignment() {
    let mut state = file_state();
    let c = &mut state;
    assert_eq!(c.paired_leaf(2).unwrap(), Some(3));
    assert_eq!(c.paired_leaf(1).unwrap(), None);
    assert!(!c.is_one_sided(1).unwrap());
    assert_eq!(c.linked_regions(2).unwrap(), vec![2, 3]);
    c.link(&[1, 2]).unwrap();
    assert_eq!(c.linked_regions(1).unwrap(), vec![1, 2, 3]);
    assert_eq!(c.paired_leaf(1).unwrap(), None);
    let RegionIds::Both(left, right) = c.cut(2, 2).unwrap() else {
        panic!("both sides were cut");
    };
    assert_eq!(c.paired_leaf(left).unwrap(), Some(right));
    assert_eq!(c.linked_regions(left).unwrap(), vec![left, right]);
    assert_eq!(c.paired_leaf(999), Err(MoveError::NoRegion(999)));
    assert_eq!(c.linked_regions(999), Err(MoveError::NoRegion(999)));
    assert_eq!(c.is_one_sided(999), Err(MoveError::NoRegion(999)));

    let mut state = cursor(Pairing::RightOnly {
        rhs: source(vec![leaf(1, 1, 0, 4)]),
    });
    let c = &mut state;
    assert_eq!(c.paired_leaf(1).unwrap(), None);
    assert!(c.is_one_sided(1).unwrap());
    assert_eq!(c.linked_regions(1).unwrap(), vec![1]);
}

#[test]
fn collapse_and_link_preserve_other_regions_labels() {
    let mut state = file_state();
    let c = &mut state;
    c.set_label(2, Some("left label".into())).unwrap();
    c.set_label(3, Some("right label".into())).unwrap();
    c.set_collapsed(1, true).unwrap();
    c.set_label(1, Some("body".into())).unwrap();
    c.link(&[2, 1]).unwrap();
    assert_eq!(data(c.get(2).unwrap()).visibility.label, "left label");
    assert_eq!(data(c.get(3).unwrap()).visibility.label, "right label");
    c.set_collapsed(1, false).unwrap();
    c.set_collapsed(1, true).unwrap();
    c.set_label(1, Some("new body".into())).unwrap();
    for id in [1, 2, 3] {
        assert!(data(c.get(id).unwrap()).visibility.collapsed);
    }
    assert_eq!(data(c.get(1).unwrap()).visibility.label, "new body");
    assert_eq!(data(c.get(2).unwrap()).visibility.label, "left label");
    assert_eq!(data(c.get(3).unwrap()).visibility.label, "right label");
}