Preserve BlameProcess in BlamePopup when jumping lines

Add Context enum to keep the blame status across line jumps

Add a context field to the GotoLinePopup

Add blame field to BlameFilePopup

Use the blame field in BlameFilePopup.open if not None

Author: andrea-berling

asyncgit/src/blame.rs

@@ -14,23 +14,25 @@ use std::{
 };
 
 ///
-#[derive(Hash, Clone, PartialEq, Eq)]
+#[derive(Hash, Clone, PartialEq, Eq, Debug)]
 pub struct BlameParams {
 	/// path to the file to blame
 	pub file_path: String,
 	/// blame at a specific revision
 	pub commit_id: Option<CommitId>,
 }
 
+#[derive(Debug)]
 struct Request<R, A>(R, Option<A>);
 
-#[derive(Default, Clone)]
+#[derive(Debug, Default, Clone)]
 struct LastResult<P, R> {
 	params: P,
 	result: R,
 }
 
 ///
+#[derive(Debug, Clone)]
 pub struct AsyncBlame {
 	current: Arc<Mutex<Request<u64, FileBlame>>>,
 	last: Arc<Mutex<Option<LastResult<BlameParams, FileBlame>>>>,

src/app.rs

@@ -21,7 +21,7 @@ use crate::{
 		TagListPopup,
 	},
 	queue::{
-		Action, AppTabs, InternalEvent, NeedsUpdate, Queue,
+		Action, AppTabs, Context, InternalEvent, NeedsUpdate, Queue,
 		StackablePopupOpen,
 	},
 	setup_popups,
@@ -675,8 +675,8 @@ impl App {
 			StackablePopupOpen::CompareCommits(param) => {
 				self.compare_commits_popup.open(param)?;
 			}
-			StackablePopupOpen::GotoLine => {
-				self.goto_line_popup.open();
+			StackablePopupOpen::GotoLine(context) => {
+				self.goto_line_popup.open(Some(context));
 			}
 		}
 
@@ -880,7 +880,7 @@ impl App {
 			InternalEvent::CommitSearch(options) => {
 				self.revlog.search(options);
 			}
-			InternalEvent::GotoLine(line) => {
+			InternalEvent::GotoLine(line, context) => {
 				if let Some(popup) = self.popup_stack.pop() {
 					if let StackablePopupOpen::BlameFile(params) =
 						popup
@@ -889,6 +889,12 @@ impl App {
 							StackablePopupOpen::BlameFile(
 								BlameFileOpen {
 									selection: Some(line),
+									blame: context.and_then(|ctx| {
+										let Context::Blame(
+											blame_process,
+										) = ctx;
+										blame_process
+									}),
 									..params
 								},
 							),

src/components/revision_files.rs

@@ -193,6 +193,7 @@ impl RevisionFilesComponent {
 					file_path: path,
 					commit_id: self.revision.as_ref().map(|c| c.id),
 					selection: None,
+					blame: None,
 				}),
 			));
 

src/components/status_tree.rs

@@ -456,6 +456,7 @@ impl Component for StatusTreeComponent {
 									file_path: status_item.path,
 									commit_id: self.revision,
 									selection: None,
+									blame: None,
 								},
 							),
 						));

src/popups/blame_file.rs

@@ -7,7 +7,7 @@ use crate::{
 	},
 	keys::{key_match, SharedKeyConfig},
 	popups::{FileRevOpen, InspectCommitOpen},
-	queue::{InternalEvent, Queue, StackablePopupOpen},
+	queue::{Context, InternalEvent, Queue, StackablePopupOpen},
 	string_utils::tabs_to_spaces,
 	strings,
 	ui::{self, style::SharedTheme, AsyncSyntaxJob, SyntaxText},
@@ -35,7 +35,8 @@ static NO_AUTHOR: &str = "<no author>";
 static MIN_AUTHOR_WIDTH: usize = 3;
 static MAX_AUTHOR_WIDTH: usize = 20;
 
-struct SyntaxFileBlame {
+#[derive(Debug, Clone)]
+pub struct SyntaxFileBlame {
 	pub file_blame: FileBlame,
 	pub styled_text: Option<SyntaxText>,
 }
@@ -54,7 +55,8 @@ impl SyntaxFileBlame {
 	}
 }
 
-enum BlameProcess {
+#[derive(Clone, Debug)]
+pub enum BlameProcess {
 	GettingBlame(AsyncBlame),
 	SyntaxHighlighting {
 		unstyled_file_blame: SyntaxFileBlame,
@@ -81,6 +83,7 @@ pub struct BlameFileOpen {
 	pub file_path: String,
 	pub commit_id: Option<CommitId>,
 	pub selection: Option<usize>,
+	pub blame: Option<BlameProcess>,
 }
 
 pub struct BlameFilePopup {
@@ -324,7 +327,9 @@ impl Component for BlameFilePopup {
 					self.hide_stacked(true);
 					self.visible = true;
 					self.queue.push(InternalEvent::OpenPopup(
-						StackablePopupOpen::GotoLine,
+						StackablePopupOpen::GotoLine(Context::Blame(
+							self.blame.clone(),
+						)),
 					));
 				}
 
@@ -375,6 +380,7 @@ impl BlameFilePopup {
 						file_path: request.file_path,
 						commit_id: request.commit_id,
 						selection: self.get_selection(),
+						blame: self.blame.clone(),
 					}),
 				));
 			}
@@ -390,11 +396,15 @@ impl BlameFilePopup {
 			file_path: open.file_path,
 			commit_id: open.commit_id,
 		});
-		self.blame =
-			Some(BlameProcess::GettingBlame(AsyncBlame::new(
-				self.repo.borrow().clone(),
-				&self.git_sender,
-			)));
+		self.blame = match open.blame {
+			None => {
+				Some(BlameProcess::GettingBlame(AsyncBlame::new(
+					self.repo.borrow().clone(),
+					&self.git_sender,
+				)))
+			}
+			blame => blame,
+		};
 		self.table_state.get_mut().select(Some(0));
 		self.visible = true;
 		self.update()?;
@@ -457,7 +467,6 @@ impl BlameFilePopup {
 									),
 								},
 							);
-							self.set_open_selection();
 							self.highlight_blame_lines();
 
 							return Ok(());
@@ -468,6 +477,7 @@ impl BlameFilePopup {
 				}
 			}
 		}
+		self.set_open_selection();
 
 		Ok(())
 	}

src/popups/file_revlog.rs

@@ -536,6 +536,7 @@ impl Component for FileRevlogPopup {
 									file_path: open_request.file_path,
 									commit_id: self.selected_commit(),
 									selection: None,
+									blame: None,
 								},
 							),
 						));

src/popups/goto_line.rs

@@ -5,7 +5,7 @@ use crate::{
 		DrawableComponent, EventState,
 	},
 	keys::{key_match, SharedKeyConfig},
-	queue::{InternalEvent, Queue},
+	queue::{Context, InternalEvent, Queue},
 	ui::{self, style::SharedTheme},
 };
 
@@ -25,6 +25,7 @@ pub struct GotoLinePopup {
 	key_config: SharedKeyConfig,
 	queue: Queue,
 	theme: SharedTheme,
+	context: Option<Context>,
 }
 
 impl GotoLinePopup {
@@ -35,11 +36,13 @@ impl GotoLinePopup {
 			key_config: env.key_config.clone(),
 			queue: env.queue.clone(),
 			theme: env.theme.clone(),
+			context: None,
 		}
 	}
 
-	pub fn open(&mut self) {
+	pub fn open(&mut self, context: Option<Context>) {
 		self.visible = true;
+		self.context = context;
 	}
 }
 
@@ -80,6 +83,7 @@ impl Component for GotoLinePopup {
 					if !self.line.is_empty() {
 						self.queue.push(InternalEvent::GotoLine(
 							self.line.parse::<usize>().expect("This shouldn't happen since the input is constrained to ascii digits only"),
+                            self.context.clone()
 						));
 					}
 					self.queue.push(InternalEvent::PopupStackPop);

src/popups/mod.rs

@@ -25,7 +25,7 @@ mod submodules;
 mod tag_commit;
 mod taglist;
 
-pub use blame_file::{BlameFileOpen, BlameFilePopup};
+pub use blame_file::{BlameFileOpen, BlameFilePopup, BlameProcess};
 pub use branchlist::BranchListPopup;
 pub use commit::CommitPopup;
 pub use compare_commits::CompareCommitsPopup;

src/queue.rs

@@ -1,8 +1,8 @@
 use crate::{
 	components::FuzzyFinderTarget,
 	popups::{
-		AppOption, BlameFileOpen, FileRevOpen, FileTreeOpen,
-		InspectCommitOpen,
+		AppOption, BlameFileOpen, BlameProcess, FileRevOpen,
+		FileTreeOpen, InspectCommitOpen,
 	},
 	tabs::StashingOptions,
 };
@@ -56,6 +56,13 @@ pub enum Action {
 	UndoCommit,
 }
 
+#[derive(Debug, Clone)]
+pub enum Context {
+	Blame(Option<BlameProcess>),
+	//FileView,
+	//PossibleRange(u32, u32),
+}
+
 #[derive(Debug)]
 pub enum StackablePopupOpen {
 	///
@@ -69,7 +76,7 @@ pub enum StackablePopupOpen {
 	///
 	CompareCommits(InspectCommitOpen),
 	///
-	GotoLine,
+	GotoLine(Context),
 }
 
 pub enum AppTabs {
@@ -149,7 +156,7 @@ pub enum InternalEvent {
 	///
 	CommitSearch(LogFilterSearchOptions),
 	///
-	GotoLine(usize),
+	GotoLine(usize, Option<Context>),
 }
 
 /// single threaded simple queue for components to communicate with each other

src/ui/syntax_text.rs

@@ -22,10 +22,12 @@ use syntect::{
 
 use crate::{AsyncAppNotification, SyntaxHighlightProgress};
 
+#[derive(Debug, Clone)]
 struct SyntaxLine {
 	items: Vec<(Style, usize, Range<usize>)>,
 }
 
+#[derive(Debug, Clone)]
 pub struct SyntaxText {
 	text: String,
 	lines: Vec<SyntaxLine>,
@@ -211,12 +213,13 @@ fn syntact_style_to_tui(style: &Style) -> ratatui::style::Style {
 	res
 }
 
+#[derive(Debug)]
 enum JobState {
 	Request((String, String)),
 	Response(SyntaxText),
 }
 
-#[derive(Clone, Default)]
+#[derive(Clone, Default, Debug)]
 pub struct AsyncSyntaxJob {
 	state: Arc<Mutex<Option<JobState>>>,
 }