tzemanovic/inflorescence - Change HC7ROIBC66IBYFED4ZZM7RXGSNC2CCBWBI36RKM2G5FD5DKVEYMQC

move main diffs state out of cursor

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

HC7ROIBC66IBYFED4ZZM7RXGSNC2CCBWBI36RKM2G5FD5DKVEYMQC

Dependencies

In channels

main

Change contents

Insertion in crates/inflorescence/src/main.rs at line 5 [17.2763]
[9.41]
[9.73]
```
use std::collections::HashMap;
```
Insertion in crates/inflorescence/src/main.rs at line 125 [17.2763]
[10.991]
[2.1520]
```
            diffs_state: HashMap::new(),
```
Insertion in crates/inflorescence/src/main.rs at line 142 [17.2763]
[10.1075]
[4.58]
```
    diffs_state: HashMap<FileId, diff::State>,
```

Replacement in crates/inflorescence/src/main.rs at line 260 [17.2763]

B:BD[5.3213] → [10.3620:3709]

B:BD[10.3709] → [11.362:409]

∅:D[11.409] → [10.3765:3779]

B:BD[10.3765] → [10.3765:3779]

            cursor::Selection::UntrackedFile {
                ix,
                path,
                diffs: diff::State::default(),
            }

[5.3213]

[10.3779]

            cursor::Selection::UntrackedFile { ix, path }

Deletion in crates/inflorescence/src/main.rs at line 282 [17.2763]
B:BD[8.1086] → [11.410:457]
```
                diffs: diff::State::default(),
```

Replacement in crates/inflorescence/src/main.rs at line 308 [17.2763]

B:BD[16.1015] → [16.1015:1110]

                              file_ix: usize,
                              hash: pijul::Hash|

[16.1015]

[16.1110]

                              file_ix: usize|

Deletion in crates/inflorescence/src/main.rs at line 311 [17.2763]
∅:D[16.1222] → [13.356:357]
∅:D[14.1940] → [13.356:357]
B:BD[13.356] → [13.356:357]

Replacement in crates/inflorescence/src/main.rs at line 335 [17.2763]

∅:D[14.2240] → [12.1027:1210]

B:BD[12.1027] → [12.1027:1210]

                    Some(cursor::Selection::UntrackedFile {
                        ix,
                        path: _,
                        diffs: _,
                    }) => {

[14.2240]

[16.1292]

                    Some(cursor::Selection::UntrackedFile { ix, path: _ }) => {

Replacement in crates/inflorescence/src/main.rs at line 374 [17.2763]

B:BD[12.2567] → [12.2567:2748]

                    Some(cursor::Selection::ChangedFile {
                        ix,
                        path: _,
                        diffs: _,
                    }) => {

[12.2567]

[16.1919]

                    Some(cursor::Selection::ChangedFile { ix, path: _ }) => {

Replacement in crates/inflorescence/src/main.rs at line 437 [17.2763]

B:BD[14.3984] → [16.2576:2639]

∅:D[16.2639] → [14.4055:4152]

B:BD[14.4055] → [14.4055:4152]

                                let file = log_file_selection(
                                    log_entry, file_ix, hash,
                                );

[14.3984]

[13.1363]

                                let file =
                                    log_file_selection(log_entry, file_ix);

Replacement in crates/inflorescence/src/main.rs at line 529 [17.2763]

∅:D[14.6578] → [10.8392:8575]

B:BD[3.9161] → [10.8392:8575]

                    Some(cursor::Selection::UntrackedFile {
                        ix,
                        path: _,
                        diffs: _,
                    }) => {

[14.6578]

[16.5655]

                    Some(cursor::Selection::UntrackedFile { ix, path: _ }) => {

Replacement in crates/inflorescence/src/main.rs at line 565 [17.2763]

B:BD[3.9907] → [10.8798:8979]

                    Some(cursor::Selection::ChangedFile {
                        ix,
                        path: _,
                        diffs: _,
                    }) => {

[3.9907]

[16.6259]

                    Some(cursor::Selection::ChangedFile { ix, path: _ }) => {

Replacement in crates/inflorescence/src/main.rs at line 621 [17.2763]

B:BD[13.2443] → [16.6893:6956]

∅:D[16.6956] → [14.7155:7252]

B:BD[14.7155] → [14.7155:7252]

                                let file = log_file_selection(
                                    log_entry, file_ix, hash,
                                );

[13.2443]

[14.7252]

                                let file =
                                    log_file_selection(log_entry, file_ix);

Replacement in crates/inflorescence/src/main.rs at line 781 [17.2763]

B:BD[14.10828] → [14.10828:11045]

                        Some(cursor::Selection::UntrackedFile {
                            ix,
                            path,
                            diffs: diff::State::default(),
                        }),

[14.10828]

[14.11045]

                        Some(cursor::Selection::UntrackedFile { ix, path }),

Replacement in crates/inflorescence/src/main.rs at line 803 [17.2763]

B:BD[14.11128] → [14.11128:11343]

                        Some(cursor::Selection::ChangedFile {
                            ix,
                            path,
                            diffs: diff::State::default(),
                        }),

[14.11128]

[14.11343]

                        Some(cursor::Selection::ChangedFile { ix, path }),

Replacement in crates/inflorescence/src/main.rs at line 820 [17.2763]
B:BD[16.9212] → [16.9212:9250]
```
                        Task::none(),
```
[16.9212]
[16.9250]
```
                        task,
```

Replacement in crates/inflorescence/src/main.rs at line 856 [17.2763]

B:BD[3.11279] → [10.10931:11127]

                if let Some(cursor::Selection::UntrackedFile {
                    ix,
                    path,
                    diffs: _,
                }) = state.cursor.selection.as_ref()

[3.11279]

[3.11408]

                if let Some(cursor::Selection::UntrackedFile { ix, path }) =
                    state.cursor.selection.as_ref()

Replacement in crates/inflorescence/src/main.rs at line 895 [17.2763]

B:BD[3.12473] → [10.11181:11375]

                if let Some(cursor::Selection::ChangedFile {
                    ix,
                    path,
                    diffs: _,
                }) = state.cursor.selection.as_ref()

[3.12473]

[3.12600]

                if let Some(cursor::Selection::ChangedFile { ix, path }) =
                    state.cursor.selection.as_ref()

Replacement in crates/inflorescence/src/main.rs at line 1068 [17.2763]

B:BD[10.13281] → [10.13281:13362]

                        cursor::Selection::UntrackedFile { ix: _, path, diffs },

[10.13281]

[10.13362]

                        cursor::Selection::UntrackedFile { ix: _, path },

Insertion in crates/inflorescence/src/main.rs at line 1071 [17.2763]

[10.13454]

[11.948]

                        let diffs = state.diffs_state.entry(id).or_default();

Replacement in crates/inflorescence/src/main.rs at line 1075 [17.2763]

B:BD[10.13560] → [10.13560:13639]

                        cursor::Selection::ChangedFile { ix: _, path, diffs },

[10.13560]

[10.13639]

                        cursor::Selection::ChangedFile { ix: _, path },

Insertion in crates/inflorescence/src/main.rs at line 1078 [17.2763]

[10.13729]

[11.1002]

                        let diffs = state.diffs_state.entry(id).or_default();

Replacement in crates/inflorescence/src/main.rs at line 1145 [17.2763]

∅:D[14.13140] → [10.14024:14201]

B:BD[3.15531] → [10.14024:14201]

                    cursor::Selection::UntrackedFile {
                        ix: _,
                        path,
                        diffs: _,
                    } => {

[14.13140]

[6.5310]

                    cursor::Selection::UntrackedFile { ix: _, path } => {

Replacement in crates/inflorescence/src/main.rs at line 1160 [17.2763]

∅:D[14.13355] → [5.7892:7999]

B:BD[5.7892] → [5.7892:7999]

B:BD[5.7999] → [14.13356:13398]

∅:D[14.13398] → [11.1056:1123]

B:BD[5.8055] → [11.1056:1123]

∅:D[11.1123] → [5.8055:8089]

∅:D[10.14516] → [5.8055:8089]

B:BD[5.8055] → [5.8055:8089]

                                cursor::Selection::UntrackedFile {
                                    ix,
                                    path,
                                    diffs: diff::State::default(),
                                }

[14.13355]

[14.13399]

                                cursor::Selection::UntrackedFile { ix, path }

Replacement in crates/inflorescence/src/main.rs at line 1164 [17.2763]

B:BD[5.8142] → [10.14517:14692]

                    cursor::Selection::ChangedFile {
                        ix: _,
                        path,
                        diffs: _,
                    } => {

[5.8142]

[15.2384]

                    cursor::Selection::ChangedFile { ix: _, path } => {

Deletion in crates/inflorescence/src/main.rs at line 1188 [17.2763]

B:BD[7.4489] → [11.1124:1191]

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

Replacement in crates/inflorescence/src/main.rs at line 1464 [17.2763]

B:BD[5.8559] → [10.16938:17095]

            Some(cursor::Selection::UntrackedFile {
                ix: _,
                path,
                diffs: selection_state,
            }) => {

[5.8559]

[10.17095]

            Some(cursor::Selection::UntrackedFile { ix: _, path }) => {

Insertion in crates/inflorescence/src/main.rs at line 1471 [17.2763]

[10.17364]

[11.1245]

                        let selection_state = state.diffs_state.get(&id);

Replacement in crates/inflorescence/src/main.rs at line 1491 [17.2763]

B:BD[5.9353] → [10.17916:18071]

            Some(cursor::Selection::ChangedFile {
                path,
                ix: _,
                diffs: selection_state,
            }) => {

[5.9353]

[10.18071]

            Some(cursor::Selection::ChangedFile { path, ix: _ }) => {

Insertion in crates/inflorescence/src/main.rs at line 1498 [17.2763]

[10.18338]

[11.1442]

                        let selection_state = state.diffs_state.get(&id);

Replacement in crates/inflorescence/src/main.rs at line 1559 [17.2763]

∅:D[16.11924] → [14.19277:19347]

B:BD[14.19277] → [14.19277:19347]

                        diff::view(state, file).map(|action| todo!())

[16.11924]

[14.19347]

                        diff::view(Some(state), file).map(|action| todo!())

Replacement in crates/inflorescence/src/diff.rs at line 28 [18.5018]

B:BD[11.2027] → [11.2027:2102]

pub fn view<'a>(state: &'a State, file: &'a File) -> Element<'a, Action> {

[11.2027]

[11.2102]

pub fn view<'a>(
    state: Option<&'a State>,
    file: &'a File,
) -> Element<'a, Action> {

Replacement in crates/inflorescence/src/diff.rs at line 397 [18.5018]
∅:D[11.8724] → [10.28170:28193]
B:BD[10.28170] → [10.28170:28193]
```
    _state: &'a State,
```
[11.8724]
[10.28193]
```
    _state: Option<&'a State>,
```
Replacement in crates/inflorescence/src/diff.rs at line 465 [18.5018]
∅:D[11.8778] → [10.28471:28494]
B:BD[10.28471] → [10.28471:28494]
```
    _state: &'a State,
```
[11.8778]
[10.28494]
```
    _state: Option<&'a State>,
```
Deletion in crates/inflorescence/src/cursor.rs at line 17 [19.26]
B:BD[10.18965] → [11.8826:8854]
```
        diffs: diff::State,
```
Deletion in crates/inflorescence/src/cursor.rs at line 21 [19.26]
B:BD[10.19068] → [11.8855:8883]
```
        diffs: diff::State,
```