caio.co/de/caca


Epoch by Caio a year ago (log)

Blob urso/src/diff/sink.rs

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
use std::ops::Range;

use gix::diff::blob::{diff as imara_diff, intern::InternedInput, Algorithm, Sink};

pub(crate) fn diff(before: &str, after: &str) -> super::UnifiedDiff {
    let input = InternedInput::new(before, after);
    let sink = StructuredSink::new(&input);

    imara_diff(Algorithm::Myers, &input, sink)
}

pub(crate) fn similarity(before: &str, after: &str) -> f32 {
    let before_len = before.len();
    let after_len = after.len();
    debug_assert!(
        before_len > 0 || after_len > 0,
        "at least one of the sides must be non empty"
    );
    let input = InternedInput::new(before, after);
    let sink = RemovedBytes::new(&input);

    let removed_bytes = imara_diff(Algorithm::Myers, &input, sink);
    (before_len - removed_bytes) as f32 / before_len.max(after_len) as f32
}

struct RemovedBytes<'a> {
    removed_bytes: usize,
    input: &'a InternedInput<&'a str>,
}

impl<'a> RemovedBytes<'a> {
    fn new(input: &'a InternedInput<&'a str>) -> Self {
        Self {
            input,
            removed_bytes: 0,
        }
    }
}

// gix's Statistics sink
// https://github.com/Byron/gitoxide/blob/72274107fdb8c8faa93a4abbe1382ca3301003c9/gix/src/object/tree/diff/tracked.rs#L407
impl<'a> Sink for RemovedBytes<'a> {
    type Out = usize;

    fn process_change(&mut self, before: Range<u32>, _after: Range<u32>) {
        self.removed_bytes += self.input.before[before.start as usize..before.end as usize]
            .iter()
            .map(|token| self.input.interner[*token].len())
            .sum::<usize>();
    }

    fn finish(self) -> Self::Out {
        self.removed_bytes
    }
}

// imara-diff's unified diff sink, but written
// to structs instead of a std::fmt::Write
// https://github.com/pascalkuthe/imara-diff/blob/30736cc43f0aa63b340c26b48aa39b98a3930de7/src/unified_diff.rs
struct StructuredSink<'a> {
    chunks: Vec<super::Chunk>,

    input: &'a InternedInput<&'a str>,
    pos: u32,
    before_hunk_start: u32,
    before_hunk_len: u32,
    after_hunk_start: u32,
    after_hunk_len: u32,

    lines: Vec<super::Line>,
}

impl<'a> StructuredSink<'a> {
    fn new(input: &'a InternedInput<&'a str>) -> Self {
        Self {
            input,
            chunks: Vec::new(),
            pos: 0,
            before_hunk_start: 0,
            before_hunk_len: 0,
            after_hunk_start: 0,
            after_hunk_len: 0,
            lines: Vec::new(),
        }
    }

    fn register_removals(&mut self, range: Range<u32>) {
        self.before_hunk_len += range.end - range.start;
        let range = range.start as usize..range.end as usize;

        for &line in self.input.before[range].iter() {
            self.lines.push(super::Line::Removal(String::from(
                self.input.interner[line],
            )));
        }
    }

    fn register_additions(&mut self, range: Range<u32>) {
        self.after_hunk_len += range.end - range.start;
        for &line in self.input.after[(range.start as usize)..(range.end as usize)].iter() {
            self.lines.push(super::Line::Addition(String::from(
                self.input.interner[line],
            )));
        }
    }

    fn register_context(&mut self, range: Range<u32>) {
        for &line in self.input.before[(range.start as usize)..(range.end as usize)].iter() {
            self.lines.push(super::Line::Context(String::from(
                self.input.interner[line],
            )));
        }
    }

    fn flush(&mut self) {
        if self.before_hunk_len == 0 && self.after_hunk_len == 0 {
            return;
        }

        // Advance to collect the context _after_ the changes
        // being careful not to go beyond the original input length
        let end = (self.pos + 3).min(self.input.before.len() as u32);
        self.advance(end, end);

        let lines = std::mem::take(&mut self.lines);
        let before_pos = self.before_hunk_start..(self.before_hunk_start + self.before_hunk_len);
        let after_pos = self.after_hunk_start..(self.after_hunk_start + self.after_hunk_len);

        self.chunks.push(super::Chunk {
            before_pos,
            after_pos,
            lines,
        });

        self.before_hunk_len = 0;
        self.after_hunk_len = 0;
    }

    fn advance(&mut self, context_to: u32, pos_to: u32) {
        self.register_context(self.pos..context_to);
        let len = context_to - self.pos;
        self.pos = pos_to;
        self.before_hunk_len += len;
        self.after_hunk_len += len;
    }
}

impl<'a> Sink for StructuredSink<'a> {
    type Out = super::UnifiedDiff;

    fn process_change(&mut self, before: Range<u32>, after: Range<u32>) {
        if before.start - self.pos > 6 {
            self.flush();
            self.pos = before.start - 3;
            self.before_hunk_start = self.pos;
            self.after_hunk_start = after.start - 3;
        }
        self.advance(before.start, before.end);
        self.register_removals(before);
        self.register_additions(after);
    }

    fn finish(mut self) -> Self::Out {
        self.flush();

        super::UnifiedDiff {
            before_lineno: self.input.before.len(),
            after_lineno: self.input.after.len(),
            chunks: self.chunks,
        }
    }
}

#[cfg(test)]
mod tests {
    use gix::diff::blob::{
        diff as imara_diff, intern::InternedInput, Algorithm, UnifiedDiffBuilder,
    };

    fn assert_unified_diff_eq(before: &str, after: &str) {
        let input = InternedInput::new(before, after);
        let expected = imara_diff(Algorithm::Myers, &input, UnifiedDiffBuilder::new(&input));

        let ours = super::diff(before, after);
        let got = ours.as_patch().expect("formatting works");

        assert_eq!(
            got, expected,
            "patches don't match!\n\nbefore:\n{before}\n\nafter:\n{after}\n"
        );
    }

    #[test]
    fn trivial() {
        assert_unified_diff_eq("", "");
        assert_unified_diff_eq("", "a");
        assert_unified_diff_eq("a", "");
        assert_unified_diff_eq("a", "b");
    }

    #[test]
    fn multiple_chunks() {
        let before = "
1
2
FIXME
4
5
6
7
8
9
10
11
REMOVEME
12
13
";
        let after = "
1
2
3
4
5
6
7
8
9
10
11
12
13
";

        assert_unified_diff_eq(before, after);
    }

    #[test]
    fn unchanged_within_delta() {
        let before = "
1
2
3
4
5
6
7
8
9
10
11
12
13
14
";
        let after = "
1
2
3
4
5
6
THIS IS NEW
7
HERE TOO
8
9
10
11
12
13
14";

        assert_unified_diff_eq(before, after);
    }
}