Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-23 17:08:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

more clear error msg which env variables are checked for external editor (#426)

Browse source
This commit is contained in:
Stephan Dilly 2020-12-11 08:57:31 +01:00
parent 183f4e85d0
commit 156776ab68
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/components/externaleditor.rs
View file

@ -66,11 +66,13 @@ impl ExternalEditorComponent {
io::stdout().execute(EnterAlternateScreen).expect("reset terminal");
}
let editor = env::var("GIT_EDITOR")
let environment_options = ["GIT_EDITOR", "VISUAL", "EDITOR"];
let editor = env::var(environment_options[0])
.ok()
.or_else(|| get_config_string(CWD, "core.editor").ok()?)
.or_else(|| env::var("VISUAL").ok())
.or_else(|| env::var("EDITOR").ok())
.or_else(|| env::var(environment_options[1]).ok())
.or_else(|| env::var(environment_options[2]).ok())
.unwrap_or_else(|| String::from("vi"));
// TODO: proper handling arguments containing whitespaces
@ -82,7 +84,10 @@ impl ExternalEditorComponent {
let mut echars = editor.chars().peekable();
let first_char = *echars.peek().ok_or_else(|| {
anyhow!("editor configuration set to empty string")
anyhow!(
"editor env variable found empty: {}",
environment_options.join(" or ")
)
})?;
let command: String = if first_char == '\"' {
echars