aboutsummaryrefslogtreecommitdiff
path: root/helix-term/src
diff options
context:
space:
mode:
authorOmnikar2021-11-06 15:57:14 +0000
committerGitHub2021-11-06 15:57:14 +0000
commited23057ff8e01404ab608682445b4f293b6142ed (patch)
tree611fc6777bc80159227f078d751bc49856b81b02 /helix-term/src
parent2c1313c0648977540c395de584b4293c1909cbf7 (diff)
Launch with defaults upon invalid config/theme (#982)
* Launch with defaults upon invalid config/theme * Startup message if there is a problematic config * Statusline error if trying to switch to an invalid theme * Use serde `deny_unknown_fields` for config
Diffstat (limited to 'helix-term/src')
-rw-r--r--helix-term/src/config.rs3
-rw-r--r--helix-term/src/main.rs11
2 files changed, 12 insertions, 2 deletions
diff --git a/helix-term/src/config.rs b/helix-term/src/config.rs
index 13917656..3745f871 100644
--- a/helix-term/src/config.rs
+++ b/helix-term/src/config.rs
@@ -3,6 +3,7 @@ use serde::Deserialize;
use crate::keymap::Keymaps;
#[derive(Debug, Default, Clone, PartialEq, Deserialize)]
+#[serde(deny_unknown_fields)]
pub struct Config {
pub theme: Option<String>,
#[serde(default)]
@@ -14,7 +15,7 @@ pub struct Config {
}
#[derive(Debug, Default, Clone, PartialEq, Deserialize)]
-#[serde(rename_all = "kebab-case")]
+#[serde(rename_all = "kebab-case", deny_unknown_fields)]
pub struct LspConfig {
pub display_messages: bool,
}
diff --git a/helix-term/src/main.rs b/helix-term/src/main.rs
index f746895c..e178b339 100644
--- a/helix-term/src/main.rs
+++ b/helix-term/src/main.rs
@@ -91,7 +91,16 @@ FLAGS:
}
let config = match std::fs::read_to_string(conf_dir.join("config.toml")) {
- Ok(config) => merge_keys(toml::from_str(&config)?),
+ Ok(config) => toml::from_str(&config)
+ .map(merge_keys)
+ .unwrap_or_else(|err| {
+ eprintln!("Bad config: {}", err);
+ eprintln!("Press <ENTER> to continue with default config");
+ use std::io::Read;
+ // This waits for an enter press.
+ let _ = std::io::stdin().read(&mut []);
+ Config::default()
+ }),
Err(err) if err.kind() == std::io::ErrorKind::NotFound => Config::default(),
Err(err) => return Err(Error::new(err)),
};