From fb41ef4fa02fb234fa0e5c9519ff5c8e99ca2c2d Mon Sep 17 00:00:00 2001
From: Yuya Nishihara <yuya@tcha.org>
Date: Fri, 11 Aug 2023 07:50:29 +0900
Subject: [PATCH] cli: handle invalid ui.editor configuration

---
 cli/src/cli_util.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cli/src/cli_util.rs b/cli/src/cli_util.rs
index 4c0c9d5e1..7a03b258e 100644
--- a/cli/src/cli_util.rs
+++ b/cli/src/cli_util.rs
@@ -2142,7 +2142,10 @@ pub fn get_new_config_file_path(
 }
 
 pub fn run_ui_editor(settings: &UserSettings, edit_path: &PathBuf) -> Result<(), CommandError> {
-    let editor: CommandNameAndArgs = settings.config().get("ui.editor").unwrap();
+    let editor: CommandNameAndArgs = settings
+        .config()
+        .get("ui.editor")
+        .map_err(|err| CommandError::ConfigError(format!("ui.editor: {err}")))?;
     let exit_status = editor
         .to_command()
         .arg(edit_path)