tzemanovic/inflorescence - Change QMAUTRB6R5R7ABWT2JIDEA7LMILZOS3PGPZIF3YUFKRVLW6HGKTQC

refactor diff

Created by Tomáš Zemanovič on May 1, 2025

QMAUTRB6R5R7ABWT2JIDEA7LMILZOS3PGPZIF3YUFKRVLW6HGKTQC

Dependencies

In channels

main

Change contents

Deletion in crates/inflorescence/src/main.rs at line 1 [2.2763]
B:BD[2.2763] → [11.1321:1340]
```
mod contents_diff;
```
Insertion in crates/inflorescence/src/main.rs at line 2 [2.2763]
[6.1219]
[6.1219]
```
mod diff;
```
Replacement in crates/inflorescence/src/main.rs at line 154 [2.2763]
B:BD[12.1370] → [12.1370:1403]
```
    Loaded(contents_diff::File),
```
[12.1370]
[7.1770]
```
    Loaded(diff::File),
```

Replacement in crates/inflorescence/src/main.rs at line 172 [2.2763]

B:BD[12.1824] → [12.1824:1898]

                contents_diff::File::Decoded(contents_diff::DecodedFile {

[12.1824]

[12.1898]

                diff::File::Decoded(diff::DecodedFile {

Replacement in crates/inflorescence/src/main.rs at line 174 [2.2763]

B:BD[12.1928] → [12.1928:1978]

                        contents_diff::Combined {

[12.1928]

[12.1978]

                        diff::Combined {

Replacement in crates/inflorescence/src/main.rs at line 184 [2.2763]

B:BD[12.2338] → [12.2338:2580]

                contents_diff::File::Undecodable(
                    contents_diff::UndecodableFile {
                        diffs_with_contents,
                        diffs_without_contents,
                    },
                ) => {

[12.2338]

[12.2580]

                diff::File::Undecodable(diff::UndecodableFile {
                    diffs_with_contents,
                    diffs_without_contents,
                }) => {

Replacement in crates/inflorescence/src/main.rs at line 239 [2.2763]
B:BD[12.3084] → [12.3084:3120]
```
        action: contents_diff::Msg,
```
[12.3084]
[6.1914]
```
        action: diff::Action,
```

Replacement in crates/inflorescence/src/main.rs at line 261 [2.2763]

B:BD[12.3709] → [12.3709:3765]

                diffs: contents_diff::State::default(),

[12.3709]

[12.3765]

                diffs: diff::State::default(),

Replacement in crates/inflorescence/src/main.rs at line 284 [2.2763]

B:BD[9.1086] → [12.4222:4278]

                diffs: contents_diff::State::default(),

[9.1086]

                diffs: diff::State::default(),

Replacement in crates/inflorescence/src/main.rs at line 523 [2.2763]

B:BD[12.9880] → [12.9880:9944]

                        diffs: contents_diff::State::default(),

[12.9880]

[12.9944]

                        diffs: diff::State::default(),

Replacement in crates/inflorescence/src/main.rs at line 546 [2.2763]

B:BD[12.10850] → [12.10850:10914]

                        diffs: contents_diff::State::default(),

[12.10850]

[9.2006]

                        diffs: diff::State::default(),

Replacement in crates/inflorescence/src/main.rs at line 737 [2.2763]

B:BD[12.11738] → [12.11738:11807]

                        contents_diff::FileContent::Decoded(decoded)

[12.11738]

[5.1411]

                        diff::FileContent::Decoded(decoded)

Replacement in crates/inflorescence/src/main.rs at line 739 [2.2763]

B:BD[5.1433] → [12.11808:11881]

                    None => contents_diff::FileContent::UnknownEncoding,

[5.1433]

[12.11881]

                    None => diff::FileContent::UnknownEncoding,

Replacement in crates/inflorescence/src/main.rs at line 743 [2.2763]

B:BD[12.11982] → [12.11982:12117]

                        let file_diff: contents_diff::File =
                            contents_diff::init_file(file_content, None);

[12.11982]

[12.12117]

                        let file_diff: diff::File =
                            diff::init_file(file_content, None);

Replacement in crates/inflorescence/src/main.rs at line 755 [2.2763]

B:BD[12.12539] → [12.12539:12797]

                            let file_diff: contents_diff::File =
                                contents_diff::init_file(
                                    file_content,
                                    changed_file,
                                );

[12.12539]

[12.12797]

                            let file_diff: diff::File =
                                diff::init_file(file_content, changed_file);

Replacement in crates/inflorescence/src/main.rs at line 776 [2.2763]

B:BD[12.13454] → [12.13454:13516]

                        contents_diff::update(diffs, action);

[12.13454]

[12.13516]

                        diff::update(diffs, action);

Replacement in crates/inflorescence/src/main.rs at line 782 [2.2763]

B:BD[12.13729] → [12.13729:13791]

                        contents_diff::update(diffs, action);

[12.13729]

[12.13791]

                        diff::update(diffs, action);

Replacement in crates/inflorescence/src/main.rs at line 869 [2.2763]

B:BD[4.8055] → [12.14440:14516]

                                    diffs: contents_diff::State::default(),

[4.8055]

                                    diffs: diff::State::default(),

Replacement in crates/inflorescence/src/main.rs at line 901 [2.2763]

B:BD[8.4489] → [12.15292:15368]

                                    diffs: contents_diff::State::default(),

[8.4489]

                                    diffs: diff::State::default(),

Replacement in crates/inflorescence/src/main.rs at line 998 [2.2763]

B:BD[12.16445] → [12.16445:16505]

        contents_diff::diffs_from_repo_diffs(changed_file);

[12.16445]

[12.16505]

        diff::from_repo_changed_file(changed_file);

Replacement in crates/inflorescence/src/main.rs at line 1079 [2.2763]

B:BD[12.17364] → [12.17364:17510]

                        contents_diff::view(selection_state, file).map(
                            move |msg| Message::FileDiffsContentsAction {

[12.17364]

[12.17510]

                        diff::view(selection_state, file).map(move |msg| {
                            Message::FileDiffsContentsAction {

Replacement in crates/inflorescence/src/main.rs at line 1083 [2.2763]

B:BD[12.17603] → [12.17603:17660]

                            },
                        )

[12.17603]

[12.17660]

                            }
                        })

Replacement in crates/inflorescence/src/main.rs at line 1104 [2.2763]

B:BD[12.18338] → [12.18338:18484]

                        contents_diff::view(selection_state, file).map(
                            move |msg| Message::FileDiffsContentsAction {

[12.18338]

[12.18484]

                        diff::view(selection_state, file).map(move |msg| {
                            Message::FileDiffsContentsAction {

Replacement in crates/inflorescence/src/main.rs at line 1108 [2.2763]

∅:D[12.18577] → [11.2931:2962]

B:BD[11.2931] → [11.2931:2962]

B:BD[11.2962] → [12.18578:18604]

                            },
                        )

[12.18577]

[11.4823]

                            }
                        })

File move: contents_diff.rs → diff.rs
BF:BFD[10.120] → [11.13188:13228]
BF:BF[11.13228] → [11.5018:5018]
[10.120]
[11.5018]

Insertion in crates/inflorescence/src/diff.rs at line 12 [11.5018]

[11.5154]

#[allow(dead_code)] // TODO rm once `view_decoded` is fully implemented
#[derive(Debug, Default)]
pub struct State {
    pub selected_sections: Vec<usize>,
    pub expanded_unchanged_sections: Vec<usize>,
    pub collapsed_changed_sections: Vec<usize>,
}
#[derive(Debug, Clone)]
pub enum Action {}
pub fn update(_state: &mut State, _action: Action) {}
pub fn view<'a>(state: &'a State, file: &'a File) -> Element<'a, Action> {
    match file {
        File::Decoded(decoded_file) => view_decoded(state, decoded_file),
        File::Undecodable(undecodable_file) => {
            view_undecodable(state, undecodable_file)
        }
    }
}
/// [`File`] is not part of [`State`] so it can be stored separately (i.e. in a
/// cache, where it's immutable once set, unlike [`State`] which can change with [`Action`]s)

Insertion in crates/inflorescence/src/diff.rs at line 64 [11.5018]

[12.19687]

    UnknownEncoding,
}
#[derive(Debug)]
pub enum DiffWithContents {
    Add,
    Edit {
        line: usize,
        deleted: bool,
        contents: String,
    },
    Replacement {
        line: usize,
        /// Deleted line
        change_contents: String,
        /// Added lines
        replacement_contents: String,
    },
    Del,
    Undel,
}
#[allow(dead_code)] // TODO rm once `view_undecodable` is implemented
#[derive(Debug)]
pub enum DiffWithoutContents {
    // _________________________________________________________________________
    // Cases that never have contents:
    Move,
    SolveNameConflict,
    UnsolveNameConflict,
    SolveOrderConflict,
    UnsolveOrderConflict,
    ResurrectZombines,
    AddRoot,
    DelRoot,
    // _________________________________________________________________________
    // Cases that normally have contents, but in these cases the contents are
    // not decodable:
    Edit {
        line: usize,
        deleted: bool,
        contents: UndecodableContents,
    },
    Replacement {
        line: usize,
        /// Deleted line
        change_contents: UndecodableContents,
        /// Added lines
        replacement_contents: UndecodableContents,
    },
}
#[allow(dead_code)] // TODO rm once `view_undecodable` is implemented
#[derive(Debug)]
pub enum UndecodableContents {
    /// Short byte sequence of unknown encoding encoded with base64 for
    /// display. Must be shorter than [`crate::repo::MAX_LEN_BASE64_DISPLAY`]
    ShortBase64(String),

Insertion in crates/inflorescence/src/diff.rs at line 123 [11.5018]

[12.19708]

}
#[derive(Debug)]
pub enum Section {
    Unchanged(Lines),
    /// `deleted` and `added` are together because for
    /// `ChangedFileDiffWithContents::Replacement` they begin on the same line
    /// number
    Changed {
        deleted: Lines,
        added: Lines,
    },

Insertion in crates/inflorescence/src/diff.rs at line 136 [11.5018]

[12.19710]


/// INVARIANT: There must be no new-lines in any of the strings, the source
/// string must be split on those.
pub type Lines = Vec<String>;

Replacement in crates/inflorescence/src/diff.rs at line 146 [11.5018]
B:BD[12.19891] → [12.19891:19927]
```
        .map(diffs_from_repo_diffs)
```
[12.19891]
[12.19927]
```
        .map(from_repo_changed_file)
```

Replacement in crates/inflorescence/src/diff.rs at line 165 [11.5018]

B:BD[11.6147] → [12.20439:20472]

pub fn combine_decoded_contents(

[11.6147]

[12.20472]

pub fn from_repo_changed_file(
    changed_file: &repo::ChangedFile,
) -> (Vec<DiffWithContents>, Vec<DiffWithoutContents>) {
    changed_file.iter().fold((vec![], vec![]), |(mut with, mut without), diff| {
         match diff {
            repo::ChangedFileDiff::Move => {
                without.push(DiffWithoutContents::Move);
            },
            repo::ChangedFileDiff::Del => {
                with.push(DiffWithContents::Del);
            },
            repo::ChangedFileDiff::Undel => {
                with.push(DiffWithContents::Undel);
            },
            repo::ChangedFileDiff::Add => {
                with.push(DiffWithContents::Add);
            },
            repo::ChangedFileDiff::SolveNameConflict => {
                without.push(DiffWithoutContents::Move);
            },
            repo::ChangedFileDiff::UnsolveNameConflict => {
                without.push(DiffWithoutContents::Move);
            },
            repo::ChangedFileDiff::Edit { line, deleted, contents } => match contents{
                repo::Contents::Decoded(lines) => {
                    with.push(DiffWithContents::Edit {
                        line: *line,
                        deleted: *deleted,
                        contents: lines.clone(),
                    });
                },
                repo::Contents::ShortBase64(short) => {
                    without.push(DiffWithoutContents::Edit {
                        line: *line,
                        deleted: *deleted,
                        contents: UndecodableContents::ShortBase64(short.clone()),
                    });
                },
                repo::Contents::UnknownEncoding(_bytes) => {
                    without.push(DiffWithoutContents::Edit {
                        line: *line,
                        deleted: *deleted,
                        contents: UndecodableContents::UnknownEncoding,
                    });
                },
            },
            repo::ChangedFileDiff::Replacement { line, change_contents, replacement_contents } => match (change_contents, replacement_contents) {
                (repo::Contents::Decoded(change), repo::Contents::Decoded(replacement)) => {
                    with.push(DiffWithContents::Replacement {
                        line: *line,
                        change_contents: change.clone(),
                        replacement_contents: replacement.clone(),
                    });
                },
                (repo::Contents::ShortBase64(change), repo::Contents::ShortBase64(replacement)) => {
                    without.push(DiffWithoutContents::Replacement {
                        line: *line,
                        change_contents: UndecodableContents::ShortBase64(change.clone()),
                        replacement_contents: UndecodableContents::ShortBase64(replacement.clone()),
                    });
                },
                (repo::Contents::UnknownEncoding(_change), repo::Contents::UnknownEncoding(_replacement)) => {
                    without.push(DiffWithoutContents::Replacement {
                        line: *line,
                        change_contents: UndecodableContents::UnknownEncoding,
                        replacement_contents: UndecodableContents::UnknownEncoding,
                    });
                },
                _ => {
                    unimplemented!("The change and replacement have different encoding!");
                }
            },
            repo::ChangedFileDiff::SolveOrderConflict => {
                without.push(DiffWithoutContents::SolveOrderConflict);
            },
            repo::ChangedFileDiff::UnsolveOrderConflict => {
                without.push(DiffWithoutContents::UnsolveOrderConflict);
            },
            repo::ChangedFileDiff::ResurrectZombines => {
                without.push(DiffWithoutContents::ResurrectZombines);
            },
            repo::ChangedFileDiff::AddRoot => {
                without.push(DiffWithoutContents::AddRoot);
            },
            repo::ChangedFileDiff::DelRoot => {
                without.push(DiffWithoutContents::DelRoot);
            },
        };
        (with, without)
    })
}
fn combine_decoded_contents(

Deletion in crates/inflorescence/src/diff.rs at line 364 [11.5018]

B:BD[11.9939] → [11.9939:9942]

B:BD[11.9942] → [12.21426:25625]

}
pub fn diffs_from_repo_diffs(
    changed_file: &repo::ChangedFile,
) -> (Vec<DiffWithContents>, Vec<DiffWithoutContents>) {
    changed_file.iter().fold((vec![], vec![]), |(mut with, mut without), diff| {
         match diff {
            repo::ChangedFileDiff::Move => {
                without.push(DiffWithoutContents::Move);
            },
            repo::ChangedFileDiff::Del => {
                with.push(DiffWithContents::Del);
            },
            repo::ChangedFileDiff::Undel => {
                with.push(DiffWithContents::Undel);
            },
            repo::ChangedFileDiff::Add => {
                with.push(DiffWithContents::Add);
            },
            repo::ChangedFileDiff::SolveNameConflict => {
                without.push(DiffWithoutContents::Move);
            },
            repo::ChangedFileDiff::UnsolveNameConflict => {
                without.push(DiffWithoutContents::Move);
            },
            repo::ChangedFileDiff::Edit { line, deleted, contents } => match contents{
                repo::Contents::Decoded(lines) => {
                    with.push(DiffWithContents::Edit {
                        line: *line,
                        deleted: *deleted,
                        contents: lines.clone(),
                    });
                },
                repo::Contents::ShortBase64(short) => {
                    without.push(DiffWithoutContents::Edit {
                        line: *line,
                        deleted: *deleted,
                        contents: UndecodableContents::ShortBase64(short.clone()),
                    });
                },
                repo::Contents::UnknownEncoding(_bytes) => {
                    without.push(DiffWithoutContents::Edit {
                        line: *line,
                        deleted: *deleted,
                        contents: UndecodableContents::UnknownEncoding,
                    });
                },
            },
            repo::ChangedFileDiff::Replacement { line, change_contents, replacement_contents } => match (change_contents, replacement_contents) {
                (repo::Contents::Decoded(change), repo::Contents::Decoded(replacement)) => {
                    with.push(DiffWithContents::Replacement {
                        line: *line,
                        change_contents: change.clone(),
                        replacement_contents: replacement.clone(),
                    });
                },
                (repo::Contents::ShortBase64(change), repo::Contents::ShortBase64(replacement)) => {
                    without.push(DiffWithoutContents::Replacement {
                        line: *line,
                        change_contents: UndecodableContents::ShortBase64(change.clone()),
                        replacement_contents: UndecodableContents::ShortBase64(replacement.clone()),
                    });
                },
                (repo::Contents::UnknownEncoding(_change), repo::Contents::UnknownEncoding(_replacement)) => {
                    without.push(DiffWithoutContents::Replacement {
                        line: *line,
                        change_contents: UndecodableContents::UnknownEncoding,
                        replacement_contents: UndecodableContents::UnknownEncoding,
                    });
                },
                _ => {
                    unimplemented!("The change and replacement have different encoding!");
                }
            },
            repo::ChangedFileDiff::SolveOrderConflict => {
                without.push(DiffWithoutContents::SolveOrderConflict);
            },
            repo::ChangedFileDiff::UnsolveOrderConflict => {
                without.push(DiffWithoutContents::UnsolveOrderConflict);
            },
            repo::ChangedFileDiff::ResurrectZombines => {
                without.push(DiffWithoutContents::ResurrectZombines);
            },
            repo::ChangedFileDiff::AddRoot => {
                without.push(DiffWithoutContents::AddRoot);
            },
            repo::ChangedFileDiff::DelRoot => {
                without.push(DiffWithoutContents::DelRoot);
            },
        };
        (with, without)
    })

Deletion in crates/inflorescence/src/diff.rs at line 366 [11.5018]

B:BD[12.25628] → [12.25628:27145]

∅:D[12.27145] → [11.10247:10250]

B:BD[11.10247] → [11.10247:10250]

B:BD[11.10250] → [12.27146:27679]

#[derive(Debug)]
pub enum DiffWithContents {
    Add,
    Edit {
        line: usize,
        deleted: bool,
        contents: String,
    },
    Replacement {
        line: usize,
        /// Deleted line
        change_contents: String,
        /// Added lines
        replacement_contents: String,
    },
    Del,
    Undel,
}
#[allow(dead_code)] // TODO rm once `view_undecodable` is implemented
#[derive(Debug)]
pub enum DiffWithoutContents {
    // _________________________________________________________________________
    // Cases that never have contents:
    Move,
    SolveNameConflict,
    UnsolveNameConflict,
    SolveOrderConflict,
    UnsolveOrderConflict,
    ResurrectZombines,
    AddRoot,
    DelRoot,
    // _________________________________________________________________________
    // Cases that normally have contents, but in these cases the contents are
    // not decodable:
    Edit {
        line: usize,
        deleted: bool,
        contents: UndecodableContents,
    },
    Replacement {
        line: usize,
        /// Deleted line
        change_contents: UndecodableContents,
        /// Added lines
        replacement_contents: UndecodableContents,
    },
}
#[allow(dead_code)] // TODO rm once `view_undecodable` is implemented
#[derive(Debug)]
pub enum UndecodableContents {
    /// Short byte sequence of unknown encoding encoded with base64 for
    /// display. Must be shorter than [`crate::repo::MAX_LEN_BASE64_DISPLAY`]
    ShortBase64(String),
    UnknownEncoding,
}
#[allow(dead_code)] // TODO rm once `view_decoded` is fully implemented
#[derive(Debug, Default)]
pub struct State {
    pub selected_sections: Vec<usize>,
    pub expanded_unchanged_sections: Vec<usize>,
    pub collapsed_changed_sections: Vec<usize>,
}
#[derive(Debug)]
pub enum Section {
    Unchanged(Lines),
    /// `deleted` and `added` are together because for
    /// `ChangedFileDiffWithContents::Replacement` they begin on the same line
    /// number
    Changed {
        deleted: Lines,
        added: Lines,
    },
}

Deletion in crates/inflorescence/src/diff.rs at line 381 [11.5018]

B:BD[11.10601] → [11.10601:10752]

B:BD[11.10752] → [12.27786:27810]

∅:D[12.27810] → [11.10769:10786]

B:BD[11.10769] → [11.10769:10786]

B:BD[11.10786] → [12.27811:28136]

    }
}
/// INVARIANT: There must be no new-lines in any of the strings, the source
/// string must be split on those.
pub type Lines = Vec<String>;
#[derive(Debug, Clone)]
pub enum Msg {}
pub fn update(_state: &mut State, _msg: Msg) {}
pub fn view<'a>(state: &'a State, file: &'a File) -> Element<'a, Msg> {
    match file {
        File::Decoded(decoded_file) => view_decoded(state, decoded_file),
        File::Undecodable(undecodable_file) => {
            view_undecodable(state, undecodable_file)
        }

Replacement in crates/inflorescence/src/diff.rs at line 384 [11.5018]
B:BD[11.10833] → [12.28145:28170]
```
pub fn view_decoded<'a>(
```
[11.10833]
[12.28170]
```
fn view_decoded<'a>(
```
Replacement in crates/inflorescence/src/diff.rs at line 387 [11.5018]
B:BD[12.28220] → [12.28220:28244]
```
) -> Element<'a, Msg> {
```
[12.28220]
[12.28244]
```
) -> Element<'a, Action> {
```
Replacement in crates/inflorescence/src/diff.rs at line 452 [11.5018]
B:BD[12.28442] → [12.28442:28471]
```
pub fn view_undecodable<'a>(
```
[12.28442]
[12.28471]
```
fn view_undecodable<'a>(
```
Replacement in crates/inflorescence/src/diff.rs at line 455 [11.5018]
B:BD[12.28525] → [12.28525:28549]
```
) -> Element<'a, Msg> {
```
[12.28525]
[12.28549]
```
) -> Element<'a, Action> {
```
Replacement in crates/inflorescence/src/cursor.rs at line 1 [3.26]
B:BD[3.26] → [12.18858:18884]
```
use crate::contents_diff;
```
[3.26]
[12.18884]
```
use crate::diff;
```
Replacement in crates/inflorescence/src/cursor.rs at line 13 [3.26]
B:BD[12.18965] → [12.18965:19002]
```
        diffs: contents_diff::State,
```
[12.18965]
[12.19002]
```
        diffs: diff::State,
```
Replacement in crates/inflorescence/src/cursor.rs at line 18 [3.26]
B:BD[12.19068] → [12.19068:19105]
```
        diffs: contents_diff::State,
```
[12.19068]
[12.19105]
```
        diffs: diff::State,
```