locate editor executable using which crate (#70)

Author: konradsz

Cargo.lock

@@ -28,6 +28,7 @@ itertools = "0.13.0"
 anyhow = "1.0.83"
 strum = { version = "0.26.2", features = ["derive"] }
 syntect = "5.2.0"
+which = "6.0.3"
 
 [dev-dependencies]
 lazy_static = "1.4.0"

Cargo.toml

@@ -4,7 +4,6 @@ use clap::ValueEnum;
 use itertools::Itertools;
 use std::{
     fmt::{self, Debug, Display, Formatter},
-    io,
     process::{Child, Command},
 };
 use strum::Display;
@@ -87,10 +86,11 @@ impl EditorCommand {
         ))
     }
 
-    pub fn spawn(&self, file_name: &str, line_number: u64) -> io::Result<Child> {
-        let mut command = Command::new(self.program());
+    pub fn spawn(&self, file_name: &str, line_number: u64) -> Result<Child> {
+        let path = which::which(self.program())?;
+        let mut command = Command::new(path);
         command.args(self.args(file_name, line_number));
-        command.spawn()
+        command.spawn().map_err(anyhow::Error::from)
     }
 
     fn program(&self) -> &str {

src/editor.rs

@@ -4,7 +4,6 @@ mod search_config;
 mod searcher;
 mod sink;
 
-use std::io;
 use std::process::ExitStatus;
 use std::sync::mpsc;
 
@@ -43,9 +42,9 @@ impl Ig {
         }
     }
 
-    fn try_spawn_editor(&self, file_name: &str, line_number: u64) -> io::Result<ExitStatus> {
+    fn try_spawn_editor(&self, file_name: &str, line_number: u64) -> anyhow::Result<ExitStatus> {
         let mut editor_process = self.editor_command.spawn(file_name, line_number)?;
-        editor_process.wait()
+        editor_process.wait().map_err(anyhow::Error::from)
     }
 
     pub fn open_file_if_requested(&mut self, selected_entry: Option<(String, u64)>) {