From 4c424d5ee442788b32eaaee67b4256aaa93aafa2 Mon Sep 17 00:00:00 2001 From: Gokul Soumya Date: Mon, 14 Feb 2022 22:11:53 +0530 Subject: Refactor language config loading (#1658) --- helix-core/src/config.rs | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 helix-core/src/config.rs (limited to 'helix-core/src/config.rs') diff --git a/helix-core/src/config.rs b/helix-core/src/config.rs new file mode 100644 index 00000000..5bd16abd --- /dev/null +++ b/helix-core/src/config.rs @@ -0,0 +1,33 @@ +use crate::merge_toml_values; + +/// Default bultin-in languages.toml. +pub fn default_lang_config() -> toml::Value { + toml::from_slice(include_bytes!("../../languages.toml")) + .expect("Could not parse bultin-in languages.toml to valid toml") +} + +/// User configured languages.toml file, merged with the default config. +pub fn user_lang_config() -> Result { + let def_lang_conf = default_lang_config(); + let data = std::fs::read(crate::config_dir().join("languages.toml")); + let user_lang_conf = match data { + Ok(raw) => { + let value = toml::from_slice(&raw)?; + merge_toml_values(def_lang_conf, value) + } + Err(_) => def_lang_conf, + }; + + Ok(user_lang_conf) +} + +/// Syntax configuration loader based on built-in languages.toml. +pub fn default_syntax_loader() -> crate::syntax::Configuration { + default_lang_config() + .try_into() + .expect("Could not serialize built-in language.toml") +} +/// Syntax configuration loader based on user configured languages.toml. +pub fn user_syntax_loader() -> Result { + user_lang_config()?.try_into() +} -- cgit v1.2.3-70-g09d2