tzemanovic/inflorescence - Change UUB7SHLRIPT6JKE64MHEJBFCS5FHH5SN5R2OOK7TR2NVCPB6VN7AC

more re-use in diffs

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

UUB7SHLRIPT6JKE64MHEJBFCS5FHH5SN5R2OOK7TR2NVCPB6VN7AC

Dependencies

In channels

main

Change contents

Replacement in crates/inflorescence/src/diff.rs at line 185 [2.5018]

B:BD[4.5205] → [4.5205:5262]

                without.push(DiffWithoutContents::Move);

[4.5205]

[4.5262]

                without.push(DiffWithoutContents::SolveNameConflict);

Replacement in crates/inflorescence/src/diff.rs at line 188 [2.5018]

B:BD[4.5337] → [4.5337:5394]

                without.push(DiffWithoutContents::Move);

[4.5337]

[4.5394]

                without.push(DiffWithoutContents::UnsolveNameConflict);

Replacement in crates/inflorescence/src/diff.rs at line 406 [2.5018]

B:BD[2.10916] → [5.445:478]

∅:D[5.478] → [2.11010:11131]

∅:D[3.28438] → [2.11010:11131]

B:BD[2.11010] → [2.11010:11131]

B:BD[2.11131] → [5.479:559]

∅:D[5.559] → [2.11131:11297]

B:BD[2.11131] → [2.11131:11297]

B:BD[2.11297] → [5.560:655]

∅:D[5.655] → [2.11432:11483]

B:BD[2.11432] → [2.11432:11483]

B:BD[2.11483] → [5.656:814]

∅:D[5.814] → [2.11624:11717]

B:BD[2.11624] → [2.11624:11717]

    let sections_view = combined
        .sections
        .iter()
        .flat_map(|section| match section {
            Section::Unchanged(lines) => {
                // TODO avoid collecting by placing these into `column` in here
                let res = lines
                    .iter()
                    .enumerate()
                    .map(|(ix, line)| {
                        el(row([
                            el(code_view("  ")),
                            el(line_num_view(
                                current_line + ix,
                                line_num_digits,
                            )),
                            el(code_view(line.clone()).width(Length::Fill)),
                        ]))
                    })
                    .collect::<Vec<_>>();

[2.10916]

[2.11717]

    let sections_view = combined.sections.iter().map(|section| match section {
        Section::Unchanged(lines) => {
            let res = lines.iter().enumerate().map(move |(ix, line)| {
                line_view(
                    LineKind::Unchanged,
                    current_line + ix,
                    line_num_digits,
                    line,
                )
            });

Replacement in crates/inflorescence/src/diff.rs at line 417 [2.5018]

B:BD[2.11718] → [2.11718:11985]

B:BD[2.11985] → [5.815:953]

∅:D[5.953] → [2.12153:12204]

B:BD[2.12153] → [2.12153:12204]

B:BD[2.12204] → [5.954:1112]

∅:D[5.1112] → [2.12345:12373]

B:BD[2.12345] → [2.12345:12373]

B:BD[2.12373] → [5.1113:1332]

∅:D[5.1332] → [2.12373:12467]

B:BD[2.12373] → [2.12373:12467]

B:BD[2.12467] → [5.1333:1471]

∅:D[5.1471] → [2.12635:12686]

B:BD[2.12635] → [2.12635:12686]

B:BD[2.12686] → [5.1472:1630]

∅:D[5.1630] → [2.12827:12855]

B:BD[2.12827] → [2.12827:12855]

B:BD[2.12855] → [5.1631:1848]

∅:D[5.1848] → [2.12855:12921]

B:BD[2.12855] → [2.12855:12921]

                current_line += lines.len();
                res
            }
            Section::Changed { deleted, added } => {
                let res = deleted
                    .iter()
                    .enumerate()
                    .map(|(ix, line)| {
                        el(container(row([
                            el(code_view("- ")),
                            el(line_num_view(
                                current_line + ix,
                                line_num_digits,
                            )),
                            el(code_view(line.clone()).width(Length::Fill)),
                        ]))
                        .style(|_theme| {
                            container::background(Background::from(
                                DELETED_BG_COLOR,
                            ))
                        }))
                    })
                    .chain(added.iter().enumerate().map(|(ix, line)| {
                        el(container(row([
                            el(code_view("+ ")),
                            el(line_num_view(
                                current_line + ix,
                                line_num_digits,
                            )),
                            el(code_view(line.clone()).width(Length::Fill)),
                        ]))
                        .style(|_theme| {
                            container::background(Background::from(
                                ADDED_BG_COLOR,
                            ))
                        }))
                    }))
                    .collect::<Vec<_>>();

[2.11718]

[2.12921]

            current_line += lines.len();
            el(column(res))
        }
        Section::Changed { deleted, added } => {
            let res = deleted
                .iter()
                .enumerate()
                .map(move |(ix, line)| {
                    line_view(
                        LineKind::Deleted,
                        current_line + ix,
                        line_num_digits,
                        line,
                    )
                })
                .chain(added.iter().enumerate().map(move |(ix, line)| {
                    line_view(
                        LineKind::Added,
                        current_line + ix,
                        line_num_digits,
                        line,
                    )
                }));

Replacement in crates/inflorescence/src/diff.rs at line 441 [2.5018]

B:BD[2.12922] → [2.12922:13042]

                current_line += added.len();
                res
            }
        })
        .collect::<Vec<_>>();

[2.12922]

[5.1849]

            current_line += added.len();
            el(column(res))
        }
    });

Replacement in crates/inflorescence/src/diff.rs at line 496 [2.5018]

B:BD[5.3093] → [5.3093:3422]

            let lines_view = lines.iter().enumerate().map(|(ix, line)| {
                el(row([
                    el(code_view(if *deleted { "- " } else { "+ " })),
                    el(line_num_view(line_num + ix, line_num_digits)),
                    el(code_view(line.clone()).width(Length::Fill)),
                ]))

[5.3093]

[5.3422]

            let lines_view = lines.into_iter().enumerate().map(|(ix, line)| {
                line_view(
                    if *deleted {
                        LineKind::Deleted
                    } else {
                        LineKind::Added
                    },
                    line_num + ix,
                    line_num_digits,
                    line,
                )

Deletion in crates/inflorescence/src/diff.rs at line 522 [2.5018]
B:BD[5.3977] → [5.3977:4025]
```
            // TODO: re-use with `view_decoded`
```
Replacement in crates/inflorescence/src/diff.rs at line 523 [2.5018]
B:BD[5.4067] → [5.4067:4091]
```
                .iter()
```
[5.4067]
[5.4091]
```
                .into_iter()
```

Replacement in crates/inflorescence/src/diff.rs at line 526 [2.5018]

B:BD[5.4156] → [5.4156:4611]

                    el(container(row([
                        el(code_view("- ")),
                        el(line_num_view(line_num + ix, line_num_digits)),
                        el(code_view(line.clone()).width(Length::Fill)),
                    ]))
                    .style(|_theme| {
                        container::background(Background::from(
                            DELETED_BG_COLOR,
                        ))
                    }))

[5.4156]

[5.4611]

                    line_view(
                        LineKind::Deleted,
                        line_num + ix,
                        line_num_digits,
                        line,
                    )

Replacement in crates/inflorescence/src/diff.rs at line 533 [2.5018]

B:BD[5.4630] → [5.4630:4695]

                .chain(replacement_lines.iter().enumerate().map(

[5.4630]

[5.4695]

                .chain(replacement_lines.into_iter().enumerate().map(

Replacement in crates/inflorescence/src/diff.rs at line 535 [2.5018]

B:BD[5.4730] → [5.4730:5223]

                        el(container(row([
                            el(code_view("+ ")),
                            el(line_num_view(line_num + ix, line_num_digits)),
                            el(code_view(line.clone()).width(Length::Fill)),
                        ]))
                        .style(|_theme| {
                            container::background(Background::from(
                                ADDED_BG_COLOR,
                            ))
                        }))

[5.4730]

[5.5223]

                        line_view(
                            LineKind::Added,
                            line_num + ix,
                            line_num_digits,
                            line,
                        )

Replacement in crates/inflorescence/src/diff.rs at line 579 [2.5018]

B:BD[6.1061] → [6.1061:1270]

            el(row([
                el(code_view(if *deleted { "- " } else { "+ " })),
                el(line_num_view(line_num, 1)),
                el(code_view(line).width(Length::Fill)),
            ]))

[6.1061]

[6.1270]

            line_view(
                if *deleted {
                    LineKind::Deleted
                } else {
                    LineKind::Added
                },
                line_num,
                1,
                line,
            )

Replacement in crates/inflorescence/src/diff.rs at line 601 [2.5018]

B:BD[6.1533] → [6.1533:1952]

                el(row([
                    el(code_view("- ")),
                    el(line_num_view(line_num, 1)),
                    el(code_view(change_line).width(Length::Fill)),
                ])),
                el(row([
                    el(code_view("+ ")),
                    el(line_num_view(line_num, 1)),
                    el(code_view(replacement_line).width(Length::Fill)),
                ])),

[6.1533]

[6.1952]

                line_view(LineKind::Deleted, line_num, 1, change_line),
                line_view(LineKind::Added, line_num, 1, replacement_line),

Replacement in crates/inflorescence/src/diff.rs at line 608 [2.5018]

B:BD[5.6305] → [5.6305:6384]

fn code_view<'a>(txt: impl text::IntoFragment<'a>) -> iced::widget::Text<'a> {

[5.6305]

[2.13149]

fn mono_text<'a>(txt: impl text::IntoFragment<'a>) -> iced::widget::Text<'a> {

Replacement in crates/inflorescence/src/diff.rs at line 615 [2.5018]

B:BD[5.6567] → [5.6567:6629]

    code_view(txt).font(Font::MONOSPACE).style(move |theme| {

[5.6567]

[5.6629]

    mono_text(txt).font(Font::MONOSPACE).style(move |theme| {

Insertion in crates/inflorescence/src/diff.rs at line 622 [2.5018]

[5.6791]


#[derive(Debug, Clone, Copy)]
enum LineKind {
    Unchanged,
    Added,
    Deleted,
}
fn line_view<'a>(
    kind: LineKind,
    line_num: usize,
    line_num_digits: usize,
    line: impl text::IntoFragment<'a>,
) -> Element<'a, Action> {
    let line = container(row([
        el(mono_text(match kind {
            LineKind::Unchanged => "  ",
            LineKind::Added => "+ ",
            LineKind::Deleted => "- ",
        })),
        el(line_num_view(line_num, line_num_digits)),
        el(mono_text(line).width(Length::Fill)),
    ]));
    el(match kind {
        LineKind::Unchanged => line,
        LineKind::Added => line.style(|_theme| {
            container::background(Background::from(ADDED_BG_COLOR))
        }),
        LineKind::Deleted => line.style(|_theme| {
            container::background(Background::from(DELETED_BG_COLOR))
        }),
    })
}