From eabee3745c489e1ee6d7d665cd824ceb1ccca5fb Mon Sep 17 00:00:00 2001 From: Dipsy Date: Tue, 6 Feb 2024 23:01:40 +0100 Subject: [PATCH] revert converting to Config before merging --- helix-term/src/config.rs | 130 ++++++++++++++++++++++----------------- 1 file changed, 73 insertions(+), 57 deletions(-) diff --git a/helix-term/src/config.rs b/helix-term/src/config.rs index d1ab7f212..f51873cad 100644 --- a/helix-term/src/config.rs +++ b/helix-term/src/config.rs @@ -10,14 +10,21 @@ use std::fs; use std::io::Error as IOError; use toml::de::Error as TomlError; -#[derive(Debug, Clone, PartialEq)] -pub struct Config { - pub workspace_config: bool, - pub theme: Option, - pub keys: HashMap, - pub editor: helix_view::editor::Config, +// Config loading error +#[derive(Debug)] +pub enum ConfigLoadError { + BadConfig(TomlError), + Error(IOError), +} + +impl Default for ConfigLoadError { + fn default() -> Self { + ConfigLoadError::Error(IOError::new(std::io::ErrorKind::NotFound, "place holder")) + } } + +// Deserializable raw config struct #[derive(Debug, Clone, PartialEq, Deserialize)] #[serde(rename_all = "kebab-case", deny_unknown_fields)] pub struct ConfigRaw { @@ -27,26 +34,60 @@ pub struct ConfigRaw { pub editor: Option, } -impl Default for Config { - fn default() -> Config { - Config { - workspace_config: false, +impl Default for ConfigRaw { + fn default() -> ConfigRaw { + Self { + workspace_config: Some(false), theme: None, - keys: keymap::default(), - editor: helix_view::editor::Config::default(), + keys: Some(keymap::default()), + editor: None, } } } -#[derive(Debug)] -pub enum ConfigLoadError { - BadConfig(TomlError), - Error(IOError), +impl ConfigRaw { + fn load(file: PathBuf) -> Result { + let source = fs::read_to_string(file).map_err(ConfigLoadError::Error)?; + toml::from_str(&source).map_err(ConfigLoadError::BadConfig) + } + + fn merge(self, other: ConfigRaw, trust: bool) -> Self { + ConfigRaw { + workspace_config: match trust { + true => other.workspace_config.or(self.workspace_config), + false => self.workspace_config, + }, + theme: other.theme.or(self.theme), + keys: match (self.keys, other.keys) { + (Some(a), Some(b)) => Some(merge_keys(a, b)), + (opt_a, opt_b) => opt_a.or(opt_b), + }, + editor: match (self.editor, other.editor) { + (Some(a), Some(b)) => Some(merge_toml_values(a, b, 3)), + (opt_a, opt_b) => opt_a.or(opt_b), + } + } + } } -impl Default for ConfigLoadError { - fn default() -> Self { - ConfigLoadError::Error(IOError::new(std::io::ErrorKind::NotFound, "place holder")) +// Final config struct +#[derive(Debug, Clone, PartialEq)] +pub struct Config { + pub workspace_config: bool, + pub theme: Option, + pub keys: HashMap, + pub editor: helix_view::editor::Config, +} + +impl Default for Config { + fn default() -> Config { + let raw = ConfigRaw::default(); + Self { + workspace_config: raw.workspace_config.unwrap_or_default(), + theme: raw.theme, + keys: raw.keys.unwrap_or_else(|| keymap::default()), + editor: helix_view::editor::Config::default(), + } } } @@ -59,13 +100,6 @@ impl Display for ConfigLoadError { } } -impl ConfigRaw { - fn load(file: PathBuf) -> Result { - let source = fs::read_to_string(file).map_err(ConfigLoadError::Error)?; - toml::from_str(&source).map_err(ConfigLoadError::BadConfig) - } -} - impl TryFrom for Config { type Error = ConfigLoadError; @@ -73,10 +107,7 @@ impl TryFrom for Config { Ok(Self { workspace_config: config.workspace_config.unwrap_or_default(), theme: config.theme, - keys: match config.keys { - Some(keys) => merge_keys(keymap::default(), keys), - None => keymap::default(), - }, + keys: config.keys.unwrap_or_else(|| keymap::default()), editor: config.editor .map(|e| e.try_into()).transpose() .map_err(ConfigLoadError::BadConfig)? @@ -87,32 +118,17 @@ impl TryFrom for Config { impl Config { pub fn load() -> Result { - // Load and parse global config returning all errors - let global: Config = ConfigRaw::load(helix_loader::config_file())?.try_into()?; - - if global.workspace_config { - global.merge(ConfigRaw::load(helix_loader::workspace_config_file())?) - } else { - Ok(global) - } - } - - fn merge(self, other: ConfigRaw) -> Result { - Ok(Config { - workspace_config: other.workspace_config.unwrap_or(self.workspace_config), - theme: other.theme.or(self.theme), - keys: match other.keys { - Some(keys) => merge_keys(self.keys, keys), - None => self.keys, - }, - editor: match other.editor { - None => self.editor, - Some(editor) => merge_toml_values( - toml::Value::try_from(self.editor).unwrap(), - editor, 3 - ).try_into().map_err(ConfigLoadError::BadConfig)?, - } - }) + let default = ConfigRaw::default(); + let global = default.merge(ConfigRaw::load(helix_loader::config_file())?, true); + + match global.workspace_config.unwrap_or_default() { + false => global, + true => match ConfigRaw::load(helix_loader::workspace_config_file()) { + Ok(workspace) => Ok(global.merge(workspace, false)), + Err(ConfigLoadError::Error(_)) => Ok(global), + error => error, + }?, + }.try_into() } } @@ -123,7 +139,7 @@ mod tests { impl Config { fn load_test(file: &str) -> Config { let raw: ConfigRaw = toml::from_str(file).unwrap(); - raw.try_into().unwrap() + ConfigRaw::default().merge(raw, true).try_into().unwrap() } }