dover 0.2.4

A CLI tool for summarizing git diffs of Rust code
Documentation
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
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
use std::{
    fmt::Display,
    ops::{Deref, Range},
};

use syn::{Item, ItemTrait, TraitItem, Visibility, spanned::Spanned};

use super::{
    functions::{Functions, FunctionsDiff},
    generics::{Generics, GenericsDiff},
};
use crate::{
    ByteRange, Change, Code, Diff, ExistenceChange, SourceFile, View, ViewableDiff, ViewableDiffs,
    VisDiff, collect_src_maps, get_source,
    overview::functions::{Function, FunctionDiff},
};

const NO_SRC_ERROR: &str = "No source text for trait, was parse logic changed?";

#[derive(Debug)]
pub struct Traits(pub Vec<Trait>);
impl Traits {
    /// Creates a complete set of `struct` declarations from a list of `Trait`s.
    pub fn from(mut traits: Vec<Trait>) -> Self {
        traits.sort_by(|t1, t2| t1.name().cmp(t2.name()));
        traits.dedup_by(|t1, t2| t1.name() == t2.name());
        Traits(traits)
    }
}
impl Diff for Traits {
    type Diff = TraitsDiff;

    fn diff_with(&self, other: &Self) -> Self::Diff {
        debug_assert!(self.0.is_sorted_by(|t1, t2| t1.name() <= t2.name()));
        debug_assert!(other.0.is_sorted_by(|t1, t2| t1.name() <= t2.name()));

        let mut trait_diffs = Vec::new();

        // file1
        for trait_ in &self.0 {
            match other.0.binary_search_by(|t| t.name().cmp(trait_.name())) {
                Ok(t) => {
                    if let Some(diff) = trait_.diff_with(&other.0[t]) {
                        trait_diffs.push(diff);
                    }
                }

                Err(_e) => {
                    // trait was deleted
                    let sdiff = TraitDiff {
                        name: trait_.name().to_string(),
                        change: Change::Existence(ExistenceChange::Deleted),
                        old: Some(trait_.original.clone()),
                        old_src: Some(trait_.source.clone()),
                        ..Default::default()
                    };
                    trait_diffs.push(sdiff);
                }
            }
        }

        // file2
        // Everything here is either new or already accounted for
        for trait_ in &other.0 {
            if let Err(_e) = self.0.binary_search_by(|t| t.name().cmp(trait_.name())) {
                let tdiff = TraitDiff {
                    name: trait_.name().to_string(),
                    change: Change::Existence(ExistenceChange::Added),
                    new: Some(trait_.original.clone()),
                    new_src: Some(trait_.source.clone()),
                    ..Default::default()
                };
                trait_diffs.push(tdiff);
            }
        }

        trait_diffs.sort_by(|d1, d2| d1.name.cmp(&d2.name));

        TraitsDiff { diffs: trait_diffs }
    }
}
impl Deref for Traits {
    type Target = [Trait];
    fn deref(&self) -> &Self::Target {
        &self.0
    }
}

#[derive(Clone, Debug, Eq, PartialEq, Hash)]
pub struct Trait {
    name: String,
    vis: Visibility,
    generics: Generics,
    items: Vec<TraitItem>,
    original: ItemTrait,
    source: SourceFile,
}
impl Trait {
    pub fn new(t: ItemTrait, source: SourceFile) -> Self {
        let original = t.clone();
        let name = t.ident.to_string();
        let vis = t.vis;
        let generics = Generics::from(t.generics);
        let items = t.items;
        Trait {
            name,
            vis,
            generics,
            items,
            original,
            source,
        }
    }
    pub fn name(&self) -> &str {
        &self.name
    }
}
impl Display for Trait {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        let source = get_source(vec![Item::Trait(self.original.clone())]);
        write!(f, "{}", source)
    }
}
impl Diff for Trait {
    type Diff = Option<TraitDiff>;
    fn diff_with(&self, other: &Self) -> Self::Diff {
        if self == other {
            return None;
        }

        let vis_diff = self.vis.diff_with(&other.vis);
        let generics_diff = self.generics.diff_with(&other.generics);
        let items_diff = {
            // TODO: only supports functions
            if self.items == other.items {
                return None;
            }

            let self_fn_items: Vec<_> = self
                .items
                .iter()
                .filter_map(|i| match i {
                    TraitItem::Fn(func) => Some(func.clone()),
                    _ => None,
                })
                .collect();
            let other_fn_items: Vec<_> = other
                .items
                .iter()
                .filter_map(|i| match i {
                    TraitItem::Fn(func) => Some(func.clone()),
                    _ => None,
                })
                .collect();

            let self_items_fns = Functions::new_trait(self_fn_items, self.source.clone());
            let other_items_fns = Functions::new_trait(other_fn_items, other.source.clone());

            let fns_diff = self_items_fns.diff_with(&other_items_fns);
            if fns_diff.is_empty() {
                None
            } else {
                Some(TraitItemsDiff { fns_diff })
            }
        };

        // it's possible for a trait to be non-equal and yet the diffs don't contain
        // anything we're interested in tracking.
        if vis_diff.is_none() && generics_diff.is_none() && items_diff.is_none() {
            return None;
        }

        let (old_src_map, new_src_map) = collect_src_maps!(vis_diff, items_diff, generics_diff,);

        let diff = TraitDiff {
            name: self.name.clone(),
            change: Change::Modified,
            old: Some(self.original.clone()),
            new: Some(other.original.clone()),
            old_src: Some(self.source.clone()),
            new_src: Some(other.source.clone()),
            old_src_map,
            new_src_map,
            vis_diff,
            items_diff,
            generics_diff,
        };

        Some(diff)
    }
}

pub struct TraitsDiff {
    diffs: Vec<TraitDiff>,
}
impl TraitsDiff {
    pub(crate) fn is_empty(&self) -> bool {
        self.diffs.is_empty()
    }
}
impl View for TraitsDiff {
    fn as_viewable(&self) -> ViewableDiffs {
        let ex_diffs = self
            .diffs
            .iter()
            .filter(|diff| matches!(diff.change, Change::Existence(_)));

        let mut viewables = ViewableDiffs::empty();
        for ex_diff in ex_diffs {
            viewables.append(ex_diff.as_viewable());
        }

        // add/delete diffs should be side-by-side
        viewables.collapse();

        let mod_diffs = self
            .diffs
            .iter()
            .filter(|diff| matches!(diff.change, Change::Modified));

        for mod_diff in mod_diffs {
            viewables.append(mod_diff.as_viewable());
        }

        viewables
    }
}

#[derive(Debug, Default)]
#[allow(unused)]
pub struct TraitDiff {
    name: String,
    change: Change,
    old: Option<ItemTrait>,
    new: Option<ItemTrait>,
    old_src: Option<SourceFile>,
    new_src: Option<SourceFile>,
    old_src_map: Vec<Range<usize>>,
    new_src_map: Vec<Range<usize>>,
    vis_diff: Option<VisDiff>,
    items_diff: Option<TraitItemsDiff>,
    generics_diff: Option<GenericsDiff>,
}
impl View for TraitDiff {
    fn as_viewable(&self) -> ViewableDiffs {
        if let Change::Existence(ex) = self.change {
            return collect_existence_diff_changes(&self.old, &self.new, ex);
        }

        let old_diff = collect_trait_diff_changes(
            self.old.as_ref().unwrap(),
            self.old_src.as_ref().unwrap().0.as_bytes(),
            &self.old_src_map,
            &self.items_diff,
            ExistenceChange::Deleted,
        );

        let new_diff = collect_trait_diff_changes(
            self.new.as_ref().unwrap(),
            self.new_src.as_ref().unwrap().0.as_bytes(),
            &self.new_src_map,
            &self.items_diff,
            ExistenceChange::Added,
        );

        ViewableDiffs::new(vec![ViewableDiff {
            old: Some(old_diff),
            new: Some(new_diff),
        }])
    }
}

// #[derive(Debug)]
// pub struct TraitItemDiff {
//     change: Change,
//     trait_fn_diff: Option<FunctionDiff>,
//     old: Option<TraitItem>,
//     new: Option<TraitItem>,
// }
// impl ByteRange for TraitItemDiff {
//     fn old_ranges(&self) -> Vec<Range<usize>> {
//         let mut ranges = vec![];

//         if let Some(old) = &self.old {
//             ranges.push(old.span().byte_range());
//         }

//         ranges
//     }

//     fn new_ranges(&self) -> Vec<Range<usize>> {
//         let mut ranges = vec![];

//         if let Some(new) = &self.new {
//             ranges.push(new.span().byte_range());
//         }

//         ranges
//     }
// }

// impl ByteRange for Vec<TraitItemDiff> {
//     fn old_ranges(&self) -> Vec<Range<usize>> {
//         let mut ranges = vec![];
//         for diff in self.iter() {
//             ranges.extend(diff.old_ranges());
//         }

//         ranges
//     }

//     fn new_ranges(&self) -> Vec<Range<usize>> {
//         let mut ranges = vec![];
//         for diff in self.iter() {
//             ranges.extend(diff.new_ranges());
//         }

//         ranges
//     }
// }

fn collect_existence_diff_changes(
    old: &Option<ItemTrait>,
    new: &Option<ItemTrait>,
    ex: ExistenceChange,
) -> ViewableDiffs {
    let trait_ = match (&old, &new) {
        (Some(_), Some(_)) => panic!("old and new traits were both Some"),
        (None, None) => panic!("old and new traits were both None"),
        (Some(trait_), None) | (None, Some(trait_)) => trait_,
    };

    let source = trait_.span().source_text().expect(NO_SRC_ERROR);
    let diff_changes = vec![(Some(ex), Code(format!("{source}\n")))];

    match ex {
        ExistenceChange::Deleted => ViewableDiffs::new(vec![ViewableDiff {
            old: Some(diff_changes),
            new: None,
        }]),
        ExistenceChange::Added => ViewableDiffs::new(vec![ViewableDiff {
            old: None,
            new: Some(diff_changes),
        }]),
    }
}

fn collect_trait_diff_changes(
    trait_: &ItemTrait,
    source_code: &[u8],
    source_map: &[Range<usize>],
    item_diffs: &Option<TraitItemsDiff>,
    ex: ExistenceChange,
) -> Vec<(Option<ExistenceChange>, Code)> {
    let source_range = trait_.span().byte_range();
    let decl_start = source_range.start;
    let sig_end = end_index_of_signature(trait_);
    let items_end = end_index_of_items(trait_, source_code);

    let mut diff_changes =
        crate::collect_diff_changes(source_code, source_map, decl_start, sig_end, ex);

    if let Some(item_diffs) = item_diffs {
        let (get_orig_item, get_sub_diff): (
            Box<dyn Fn(&FunctionDiff) -> Option<&Function>>,
            Box<dyn Fn(ViewableDiff) -> Option<Vec<(Option<ExistenceChange>, Code)>>>,
        );
        match ex {
            ExistenceChange::Added => {
                get_orig_item = Box::new(|fd: &FunctionDiff| fd.new().as_ref());
                get_sub_diff = Box::new(|vd: ViewableDiff| vd.new);
            }
            ExistenceChange::Deleted => {
                get_orig_item = Box::new(|fd: &FunctionDiff| fd.old().as_ref());
                get_sub_diff = Box::new(|vd: ViewableDiff| vd.old);
            }
        };
        let diffs_as_changes = collect_item_diff_changes(
            source_code,
            trait_,
            sig_end,
            item_diffs,
            get_orig_item,
            get_sub_diff,
        );
        diff_changes.extend(diffs_as_changes);
    }

    // collect remaining whitespace and closing ')' or '}'
    let code = String::from_utf8(source_code[items_end..source_range.end].to_vec())
        .expect("Off a code boundary");

    diff_changes.push((None, Code(code)));
    diff_changes
}

/// Converts field diffs into spans of code indicating the changes, if any.
fn collect_item_diff_changes(
    // The full source code for the file we're parsing
    source_code: &[u8],
    // The trait we're parsing
    trait_: &ItemTrait,
    // The index at which the signature ends
    sig_end: usize,
    // The field diffs for the file we're parsing
    tids: &TraitItemsDiff,
    // How to get the original TraitItem from a TraitItemDiff (old or new method)
    get_original_item: Box<dyn Fn(&FunctionDiff) -> Option<&Function>>,
    // How to get sub diffs from a given viewable diff (old or new field)
    get_sub_diffs: Box<dyn Fn(ViewableDiff) -> Option<Vec<(Option<ExistenceChange>, Code)>>>,
) -> Vec<(Option<ExistenceChange>, Code)> {
    let mut diffs = Vec::new();
    let mut i = sig_end;
    let trait_range = trait_.span().byte_range();

    if trait_.items.len() > tids.len() {
        let elided_whitespace =
            crate::collect_elided_whitespace(sig_end, source_code, trait_range.end);
        diffs.push((None, Code(elided_whitespace)));
    }

    while i < trait_range.end {
        let maybe_item_diff = tids.diffs().iter().find(|d| {
            get_original_item(d)
                .as_ref()
                .map(|item| item.original().span().byte_range().contains(&i))
                .unwrap_or(false)
        });
        match maybe_item_diff {
            Some(id) => {
                // Going to walk backwards and get all preceding whitespace until a newline or a character
                let item_diff_range = get_original_item(id)
                    .as_ref()
                    .unwrap()
                    .original()
                    .span()
                    .byte_range();
                let item_diff_start = item_diff_range.start;
                let item_diff_end = item_diff_range.end;

                let whitespace = crate::collect_preceding_whitespace(source_code, item_diff_start);
                diffs.push((None, Code(whitespace)));

                // then get the actual diff
                let viewable = id.as_viewable();
                for diff in viewable.vds {
                    if let Some(sub_diff) = get_sub_diffs(diff) {
                        diffs.extend(sub_diff);
                    }
                }

                i = item_diff_end;
            }
            None => {
                i += 1;
            }
        }
    }

    diffs
}

fn end_index_of_signature(trait_: &ItemTrait) -> usize {
    trait_.brace_token.span.span().byte_range().start + 1
}

fn end_index_of_items(trait_: &ItemTrait, source_code: &[u8]) -> usize {
    let mut index_before_close_brace = trait_.span().byte_range().end - 2;
    while index_before_close_brace > 0
        && source_code[index_before_close_brace].is_ascii_whitespace()
    {
        index_before_close_brace -= 1;
    }

    index_before_close_brace += 1; // we want 1 index beyond the last char we ended at
    index_before_close_brace
}

#[derive(Debug)]
pub struct TraitItemsDiff {
    fns_diff: FunctionsDiff,
}
impl TraitItemsDiff {
    pub fn diffs(&self) -> &[FunctionDiff] {
        self.fns_diff.diffs()
    }
    pub fn len(&self) -> usize {
        self.fns_diff.diffs().len()
    }
}
impl ByteRange for TraitItemsDiff {
    fn old_ranges(&self) -> Vec<Range<usize>> {
        self.fns_diff.old_ranges()
    }

    fn new_ranges(&self) -> Vec<Range<usize>> {
        self.fns_diff.new_ranges()
    }
}