Merge pull request #13165 from gitbutlerapp/dp-patch-hunk-picking

feat(tui): patch hunk picking

Author: davidpdrsn

Cargo.lock

@@ -153,6 +153,7 @@ syntect = { version = "5.3.0", default-features = false, features = [
     "html",
 ] }
 tracing-appender = "0.2.4"
+uuid.workspace = true
 
 [dev-dependencies]
 but-graph.workspace = true

crates/but/Cargo.toml

@@ -1,5 +1,7 @@
 use std::sync::Arc;
 
+use gitbutler_stack::StackId;
+
 use crate::{
     CliId,
     command::legacy::status::{
@@ -94,6 +96,20 @@ impl Cursor {
         Some(Self(idx))
     }
 
+    /// Select the first line that points to the given branch name.
+    pub(super) fn select_stack(stack_id: StackId, lines: &[StatusOutputLine]) -> Option<Self> {
+        let idx = lines.iter().position(|line| {
+            if let Some(CliId::Stack { stack_id: id, .. }) = line.data.cli_id().map(|id| &**id)
+                && stack_id == *id
+            {
+                true
+            } else {
+                false
+            }
+        })?;
+        Some(Self(idx))
+    }
+
     /// Select the first line that points to the unassigned section.
     pub(super) fn select_unassigned(lines: &[StatusOutputLine]) -> Option<Self> {
         let idx = lines.iter().position(|line| {
@@ -381,7 +397,7 @@ pub(super) fn is_selectable_in_mode(
     match mode {
         Mode::Rub(rub_mode) | Mode::RubButApi(rub_mode) => {
             if let Some(cli_id) = line.data.cli_id()
-                && &rub_mode.source == cli_id
+                && rub_mode.source == **cli_id
             {
                 return true;
             }
@@ -400,11 +416,15 @@ pub(super) fn is_selectable_in_mode(
                 return true;
             }
         }
-        Mode::Command(..) | Mode::InlineReword(..) | Mode::Normal | Mode::Branch => {}
+        Mode::Command(..)
+        | Mode::InlineReword(..)
+        | Mode::Normal
+        | Mode::Branch
+        | Mode::Details => {}
     }
 
     match mode {
-        Mode::Normal => match show_files {
+        Mode::Normal | Mode::Details => match show_files {
             FilesStatusFlag::None | FilesStatusFlag::All => true,
             FilesStatusFlag::Commit(object_id) => {
                 if let Some(cli_id) = line.data.cli_id()

crates/but/src/command/legacy/status/tui/cursor/mod.rs

@@ -11,7 +11,8 @@ use crate::{
         CommitClassification, FilesStatusFlag,
         output::{StatusOutputContent, StatusOutputLine, StatusOutputLineData},
         tui::{
-            CommitMode, CommitSource, InlineRewordMode, Mode, RubMode, mode::UnassignedCommitSource,
+            CommitMode, CommitSource, InlineRewordMode, Mode, RubMode, RubSource,
+            mode::UnassignedCommitSource,
         },
     },
 };
@@ -1023,8 +1024,9 @@ fn move_up_in_rub_mode_skips_unavailable_targets() {
         }),
     ];
     let mode = Mode::Rub(RubMode {
-        source: unassigned("source"),
+        source: RubSource::CliId(unassigned("source")),
         available_targets: vec![allowed],
+        _unlock_details: None,
     });
 
     let mut cursor = Cursor(2);
@@ -1057,8 +1059,9 @@ fn move_down_in_rub_mode_skips_unavailable_targets() {
         }),
     ];
     let mode = Mode::Rub(RubMode {
-        source: unassigned("source"),
+        source: RubSource::CliId(unassigned("source")),
         available_targets: vec![allowed],
+        _unlock_details: None,
     });
 
     let mut cursor = Cursor(0);
@@ -1101,8 +1104,9 @@ fn movement_in_rub_mode_handles_starting_on_unavailable_line() {
         }),
     ];
     let mode = Mode::Rub(RubMode {
-        source: unassigned("source"),
+        source: RubSource::CliId(unassigned("source")),
         available_targets: vec![allowed_a, allowed_b],
+        _unlock_details: None,
     });
 
     let mut cursor = Cursor(2);
@@ -1230,8 +1234,9 @@ fn move_next_section_in_rub_mode_skips_unavailable_sections() {
         }),
     ];
     let mode = Mode::Rub(RubMode {
-        source: unassigned("source"),
+        source: RubSource::CliId(unassigned("source")),
         available_targets: vec![allowed],
+        _unlock_details: None,
     });
 
     let mut cursor = Cursor(0);
@@ -1267,8 +1272,9 @@ fn move_previous_section_in_rub_mode_moves_to_current_available_section_header()
         }),
     ];
     let mode = Mode::Rub(RubMode {
-        source: unassigned("source"),
+        source: RubSource::CliId(unassigned("source")),
         available_targets: vec![allowed],
+        _unlock_details: None,
     });
 
     let mut cursor = Cursor(3);
@@ -1307,8 +1313,9 @@ fn move_previous_section_in_rub_mode_from_unavailable_section_header_goes_to_pre
         line(StatusOutputLineData::UnassignedChanges { cli_id: blocked }),
     ];
     let mode = Mode::Rub(RubMode {
-        source: unassigned("source"),
+        source: RubSource::CliId(unassigned("source")),
         available_targets: vec![allowed_a, allowed_b],
+        _unlock_details: None,
     });
 
     let mut cursor = Cursor(2);
@@ -1376,8 +1383,9 @@ fn is_selectable_in_rub_mode_requires_available_target() {
     let not_selectable_line = line(StatusOutputLineData::Hint);
 
     let mode = Mode::Rub(RubMode {
-        source: unassigned("source"),
+        source: RubSource::CliId(unassigned("source")),
         available_targets: vec![allowed],
+        _unlock_details: None,
     });
 
     assert!(is_selectable_in_mode(

crates/but/src/command/legacy/status/tui/cursor/tests.rs

@@ -0,0 +1,38 @@
+use crate::command::legacy::status::tui::details::{PartiallyRenderedDiffSection, SectionId};
+
+#[derive(Default, Debug)]
+pub(super) struct DetailsCursor {
+    selection_section: Option<SectionId>,
+}
+
+impl DetailsCursor {
+    pub(super) fn move_selection_by<F>(&mut self, sections: &[PartiallyRenderedDiffSection], f: F)
+    where
+        F: FnOnce(usize) -> usize,
+    {
+        let Some(selection) = self.selection() else {
+            return;
+        };
+        let Some(current_selection_idx) =
+            sections.iter().position(|section| &section.id == selection)
+        else {
+            return;
+        };
+        let Some(next) = sections.get(f(current_selection_idx)) else {
+            return;
+        };
+        self.select_section(next.id.clone());
+    }
+
+    pub(super) fn select_section(&mut self, id: SectionId) {
+        self.selection_section = Some(id);
+    }
+
+    pub(super) fn deselect(&mut self) {
+        self.selection_section = None;
+    }
+
+    pub(super) fn selection(&self) -> Option<&SectionId> {
+        self.selection_section.as_ref()
+    }
+}