add cli flag to open files tab with selected file #2510

Author: laktak

src/app.rs

@@ -175,7 +175,20 @@ impl App {
 			sender_app,
 		};
 
-		let tab = env.options.borrow().current_tab();
+		let mut select_file: Option<PathBuf> = None;
+		let tab = if let Some(file) = cliargs.select_file {
+			// convert to relative git path
+			if let Ok(abs) = file.canonicalize() {
+				if let Ok(path) = abs.strip_prefix(
+					env.repo.borrow().gitpath().canonicalize()?,
+				) {
+					select_file = Some(Path::new(".").join(path));
+				}
+			}
+			2
+		} else {
+			env.options.borrow().current_tab()
+		};
 
 		let mut app = Self {
 			input,
@@ -220,7 +233,7 @@ impl App {
 			status_tab: Status::new(&env),
 			stashing_tab: Stashing::new(&env),
 			stashlist_tab: StashList::new(&env),
-			files_tab: FilesTab::new(&env),
+			files_tab: FilesTab::new(&env, select_file),
 			goto_line_popup: GotoLinePopup::new(&env),
 			tab: 0,
 			queue: env.queue,
@@ -234,21 +247,7 @@ impl App {
 			popup_stack: PopupStack::default(),
 		};
 
-		if let Some(file) = cliargs.select_file {
-			app.set_tab(2)?;
-			// convert to relative git path
-			if let Ok(abs) = file.canonicalize() {
-				let repo =
-					app.repo.borrow().gitpath().canonicalize()?;
-				if let Ok(path) = abs.strip_prefix(repo) {
-					app.queue.push(InternalEvent::SelectFile {
-						path: Path::new(".").join(path),
-					});
-				}
-			}
-		} else {
-			app.set_tab(tab)?;
-		}
+		app.set_tab(tab)?;
 
 		Ok(app)
 	}
@@ -791,9 +790,6 @@ impl App {
 			InternalEvent::SelectBranch => {
 				self.select_branch_popup.open()?;
 			}
-			InternalEvent::SelectFile { path } => {
-				self.files_tab.find_file(&path);
-			}
 			InternalEvent::ViewSubmodules => {
 				self.submodule_popup.open()?;
 			}

src/components/revision_files.rs

@@ -30,7 +30,10 @@ use ratatui::{
 	Frame,
 };
 use std::{borrow::Cow, fmt::Write};
-use std::{collections::BTreeSet, path::Path};
+use std::{
+	collections::BTreeSet,
+	path::{Path, PathBuf},
+};
 use unicode_truncate::UnicodeTruncateStr;
 use unicode_width::UnicodeWidthStr;
 
@@ -53,11 +56,15 @@ pub struct RevisionFilesComponent {
 	revision: Option<CommitInfo>,
 	focus: Focus,
 	key_config: SharedKeyConfig,
+	select_file: Option<PathBuf>,
 }
 
 impl RevisionFilesComponent {
 	///
-	pub fn new(env: &Environment) -> Self {
+	pub fn new(
+		env: &Environment,
+		select_file: Option<PathBuf>,
+	) -> Self {
 		Self {
 			queue: env.queue.clone(),
 			tree: FileTree::default(),
@@ -72,6 +79,7 @@ impl RevisionFilesComponent {
 			focus: Focus::Tree,
 			key_config: env.key_config.clone(),
 			repo: env.repo.clone(),
+			select_file,
 			visible: false,
 		}
 	}
@@ -134,6 +142,12 @@ impl RevisionFilesComponent {
 						self.tree.collapse_but_root();
 
 						self.files = Some(last);
+
+						let select_file = self.select_file.clone();
+						self.select_file = None;
+						if let Some(file) = select_file {
+							self.find_file(file.as_path());
+						}
 					}
 				} else if let Some(rev) = &self.revision {
 					self.request_files(rev.id);

src/popups/revision_files.rs

@@ -38,7 +38,7 @@ impl RevisionFilesPopup {
 	///
 	pub fn new(env: &Environment) -> Self {
 		Self {
-			files: RevisionFilesComponent::new(env),
+			files: RevisionFilesComponent::new(env, None),
 			visible: false,
 			key_config: env.key_config.clone(),
 			open_request: None,

src/queue.rs

@@ -120,8 +120,6 @@ pub enum InternalEvent {
 	///
 	SelectBranch,
 	///
-	SelectFile { path: PathBuf },
-	///
 	OpenExternalEditor(Option<String>),
 	///
 	Push(String, PushType, bool, bool),

src/tabs/files.rs

@@ -1,4 +1,4 @@
-use std::path::Path;
+use std::path::{Path, PathBuf};
 
 use crate::{
 	app::Environment,
@@ -19,10 +19,13 @@ pub struct FilesTab {
 
 impl FilesTab {
 	///
-	pub fn new(env: &Environment) -> Self {
+	pub fn new(
+		env: &Environment,
+		select_file: Option<PathBuf>,
+	) -> Self {
 		Self {
 			visible: false,
-			files: RevisionFilesComponent::new(env),
+			files: RevisionFilesComponent::new(env, select_file),
 			repo: env.repo.clone(),
 		}
 	}
@@ -58,10 +61,6 @@ impl FilesTab {
 	pub fn file_finder_update(&mut self, file: &Path) {
 		self.files.find_file(file);
 	}
-
-	pub fn find_file(&mut self, file: &Path) {
-		self.files.find_file(file);
-	}
 }
 
 impl DrawableComponent for FilesTab {