extrawurst/gitui
1
1
Fork 0
mirror of https://github.com/extrawurst/gitui.git synced 2024-12-29 12:06:26 +03:00
Code Issues Projects Releases Wiki Activity

Add support for spaces in file path

Browse Source 
If the file path contained a space, the editor would be launched with an incomplete file path.

This also switches to using `OsStr` for the file path, which means that if the file name contains invalid UTF-8, it will not blow up because of gitui.
This commit is contained in:
Jon Grythe Stødle 2020-07-29 20:13:57 +02:00 committed by Stephan Dilly
parent 6b4d088b28
commit 8db6325777
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/components/externaleditor.rs
View File

@ -14,6 +14,7 @@ use crossterm::{
ExecutableCommand,
};
use scopeguard::defer;
use std::ffi::OsStr;
use std::{env, io, path::Path, process::Command};
use tui::{
backend::Backend,
@ -56,24 +57,25 @@ impl ExternalEditorComponent {
io::stdout().execute(EnterAlternateScreen).expect("reset terminal");
}
let mut editor = env::var("GIT_EDITOR")
let editor = env::var("GIT_EDITOR")
.ok()
.or_else(|| env::var("VISUAL").ok())
.or_else(|| env::var("EDITOR").ok())
.unwrap_or_else(|| String::from("vi"));
//TODO: check the path.to_str result and return err on None because
//otherwise this will pretty likely fail in the command stage otherwise
//and https://github.com/extrawurst/gitui/issues/184 showed how weird
//'vi' handles opening not existing files
editor.push_str(&format!(" {}", path.to_string_lossy()));
// TODO: proper handling arguments containing whitespaces
// This does not do the right thing if the input is `editor --something "with spaces"`
let mut editor = editor.split_whitespace();
let command = editor.next().ok_or_else(|| {
anyhow!("unable to read editor command")
})?;
let mut editor: Vec<&OsStr> =
editor.map(|s| OsStr::new(s)).collect();
editor.push(path.as_os_str());
Command::new(command)
.current_dir(work_dir)
.args(editor)