mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

term: Improve errors when editor can't be spawned

This commit is contained in:
cloudhead 2024-03-22 14:09:27 +01:00
parent 0581c017ae
commit 9f4227d378
No known key found for this signature in database
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
radicle-term/src/editor.rs
View File

@ -83,13 +83,25 @@ impl Editor {
process::Stdio::from(tty) process::Stdio::from(tty)
}; };
process::Command::new(cmd) process::Command::new(&cmd)
.stdout(unsafe { process::Stdio::from_raw_fd(stderr) }) .stdout(unsafe { process::Stdio::from_raw_fd(stderr) })
.stderr(process::Stdio::inherit()) .stderr(process::Stdio::inherit())
.stdin(stdin) .stdin(stdin)
.arg(&self.path) .arg(&self.path)
.spawn()? .spawn()
.wait()?; .map_err(|e| {
io::Error::new(
e.kind(),
format!("failed to spawn editor command {cmd:?}: {e}"),
)
})?
.wait()
.map_err(|e| {
io::Error::new(
e.kind(),
format!("editor command {cmd:?} didn't spawn: {e}"),
)
})?;
let text = fs::read_to_string(&self.path)?; let text = fs::read_to_string(&self.path)?;
if text.trim().is_empty() { if text.trim().is_empty() {