Load blame from the last blame file instead of context

Remove context and references to it

Addres #2262 (comment)

Address #2262 (comment)

Author: andrea-berling

src/app.rs

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

src/popups/blame_file.rs

@@ -7,7 +7,7 @@ use crate::{
 	},
 	keys::{key_match, SharedKeyConfig},
 	popups::{FileRevOpen, InspectCommitOpen},
-	queue::{Context, InternalEvent, Queue, StackablePopupOpen},
+	queue::{InternalEvent, Queue, StackablePopupOpen},
 	string_utils::tabs_to_spaces,
 	strings,
 	ui::{self, style::SharedTheme, AsyncSyntaxJob, SyntaxText},
@@ -96,7 +96,7 @@ pub struct BlameFilePopup {
 	table_state: std::cell::Cell<TableState>,
 	key_config: SharedKeyConfig,
 	current_height: std::cell::Cell<usize>,
-	blame: Option<BlameProcess>,
+	pub blame: Option<BlameProcess>,
 	app_sender: Sender<AsyncAppNotification>,
 	git_sender: Sender<AsyncGitNotification>,
 	repo: RepoPathRef,
@@ -327,9 +327,7 @@ impl Component for BlameFilePopup {
 					self.hide_stacked(true);
 					self.visible = true;
 					self.queue.push(InternalEvent::OpenPopup(
-						StackablePopupOpen::GotoLine(Context::Blame(
-							self.blame.clone(),
-						)),
+						StackablePopupOpen::GotoLine,
 					));
 				}
 
@@ -751,7 +749,8 @@ impl BlameFilePopup {
 		{
 			let mut table_state = self.table_state.take();
 			let max_line_number = self.get_max_line_number();
-			table_state.select(Some(selection.min(max_line_number)));
+			table_state
+				.select(Some(selection.clamp(0, max_line_number)));
 			self.table_state.set(table_state);
 		}
 	}

src/popups/goto_line.rs

@@ -5,7 +5,7 @@ use crate::{
 		DrawableComponent, EventState,
 	},
 	keys::{key_match, SharedKeyConfig},
-	queue::{Context, InternalEvent, Queue},
+	queue::{InternalEvent, Queue},
 	ui::{self, style::SharedTheme},
 };
 
@@ -25,7 +25,6 @@ pub struct GotoLinePopup {
 	key_config: SharedKeyConfig,
 	queue: Queue,
 	theme: SharedTheme,
-	context: Option<Context>,
 }
 
 impl GotoLinePopup {
@@ -36,13 +35,11 @@ impl GotoLinePopup {
 			key_config: env.key_config.clone(),
 			queue: env.queue.clone(),
 			theme: env.theme.clone(),
-			context: None,
 		}
 	}
 
-	pub fn open(&mut self, context: Option<Context>) {
+	pub fn open(&mut self) {
 		self.visible = true;
-		self.context = context;
 	}
 }
 
@@ -82,8 +79,7 @@ impl Component for GotoLinePopup {
 					self.visible = false;
 					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.line.parse::<usize>()?,
 						));
 					}
 					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, BlameProcess};
+pub use blame_file::{BlameFileOpen, BlameFilePopup};
 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, BlameProcess, FileRevOpen,
-		FileTreeOpen, InspectCommitOpen,
+		AppOption, BlameFileOpen, FileRevOpen, FileTreeOpen,
+		InspectCommitOpen,
 	},
 	tabs::StashingOptions,
 };
@@ -56,13 +56,6 @@ pub enum Action {
 	UndoCommit,
 }
 
-#[derive(Debug, Clone)]
-pub enum Context {
-	Blame(Option<BlameProcess>),
-	//FileView,
-	//PossibleRange(u32, u32),
-}
-
 #[derive(Debug)]
 pub enum StackablePopupOpen {
 	///
@@ -76,7 +69,7 @@ pub enum StackablePopupOpen {
 	///
 	CompareCommits(InspectCommitOpen),
 	///
-	GotoLine(Context),
+	GotoLine,
 }
 
 pub enum AppTabs {
@@ -156,7 +149,7 @@ pub enum InternalEvent {
 	///
 	CommitSearch(LogFilterSearchOptions),
 	///
-	GotoLine(usize, Option<Context>),
+	GotoLine(usize),
 }
 
 /// single threaded simple queue for components to communicate with each other