From 108b785a3645753793421a53abfdd7fe2a912c34 Mon Sep 17 00:00:00 2001
From: Martin von Zweigbergk <martinvonz@google.com>
Date: Thu, 17 Feb 2022 22:44:14 -0800
Subject: [PATCH] cli: don't panic on invalid config

If `~/.jjconfig` is invalid, we currently simply panic. That results
in a poor error message. We should handle the error instead.

Closes #55.
---
 lib/src/settings.rs |  2 +-
 src/main.rs         | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/src/settings.rs b/lib/src/settings.rs
index fa0db5b52..5777fa0b9 100644
--- a/lib/src/settings.rs
+++ b/lib/src/settings.rs
@@ -14,7 +14,7 @@
 
 use std::path::Path;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Default)]
 pub struct UserSettings {
     config: config::Config,
 }
diff --git a/src/main.rs b/src/main.rs
index 3a0717c3b..7d695c6b1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -20,8 +20,16 @@ fn main() {
     // TODO: We need to do some argument parsing here, at least for things like
     // --config,       and for reading user configs from the repo pointed to by
     // -R.
-    let user_settings = UserSettings::for_user().unwrap();
-    let ui = Ui::for_terminal(user_settings);
-    let status = dispatch(ui, &mut std::env::args_os());
-    std::process::exit(status);
+    match UserSettings::for_user() {
+        Ok(user_settings) => {
+            let ui = Ui::for_terminal(user_settings);
+            let status = dispatch(ui, &mut std::env::args_os());
+            std::process::exit(status);
+        }
+        Err(err) => {
+            let mut ui = Ui::for_terminal(UserSettings::default());
+            ui.write_error(&format!("Invalid config: {}\n", err))
+                .unwrap();
+        }
+    }
 }