suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use default `languages.toml` if user's is invalid (#994)

pull/1032/head
Omnikar 2021-11-08 21:07:54 -05:00 committed by GitHub
parent eb68cd3767
commit a424ef4e20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
helix-core/src/syntax.rs
View File

@ -40,13 +40,14 @@ where
} }
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub struct Configuration { pub struct Configuration {
pub language: Vec<LanguageConfiguration>, pub language: Vec<LanguageConfiguration>,
} }
// largely based on tree-sitter/cli/src/loader.rs // largely based on tree-sitter/cli/src/loader.rs
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case", deny_unknown_fields)]
pub struct LanguageConfiguration { pub struct LanguageConfiguration {
#[serde(rename = "name")] #[serde(rename = "name")]
pub language_id: String, pub language_id: String,

28
helix-term/src/application.rs
View File

@ -60,14 +60,19 @@ impl Application {
std::sync::Arc::new(theme::Loader::new(&conf_dir, &helix_core::runtime_dir())); std::sync::Arc::new(theme::Loader::new(&conf_dir, &helix_core::runtime_dir()));
// load default and user config, and merge both // load default and user config, and merge both
let def_lang_conf: toml::Value = toml::from_slice(include_bytes!("../../languages.toml")) let builtin_err_msg =
.expect("Could not parse built-in languages.toml, something must be very wrong"); "Could not parse built-in languages.toml, something must be very wrong";
let user_lang_conf: Option<toml::Value> = std::fs::read(conf_dir.join("languages.toml")) let def_lang_conf: toml::Value =
toml::from_slice(include_bytes!("../../languages.toml")).expect(builtin_err_msg);
let def_syn_loader_conf: helix_core::syntax::Configuration =
def_lang_conf.clone().try_into().expect(builtin_err_msg);
let user_lang_conf = std::fs::read(conf_dir.join("languages.toml"))
.ok() .ok()
.map(|raw| toml::from_slice(&raw).expect("Could not parse user languages.toml")); .map(|raw| toml::from_slice(&raw));
let lang_conf = match user_lang_conf { let lang_conf = match user_lang_conf {
Some(value) => merge_toml_values(def_lang_conf, value), Some(Ok(value)) => Ok(merge_toml_values(def_lang_conf, value)),
None => def_lang_conf, Some(err @ Err(_)) => err,
None => Ok(def_lang_conf),
}; };
let theme = if let Some(theme) = &config.theme { let theme = if let Some(theme) = &config.theme {
@ -83,8 +88,15 @@ impl Application {
}; };
let syn_loader_conf: helix_core::syntax::Configuration = lang_conf let syn_loader_conf: helix_core::syntax::Configuration = lang_conf
.try_into() .and_then(|conf| conf.try_into())
.expect("Could not parse merged (built-in + user) languages.toml"); .unwrap_or_else(|err| {
eprintln!("Bad language config: {}", err);
eprintln!("Press <ENTER> to continue with default language config");
use std::io::Read;
// This waits for an enter press.
let _ = std::io::stdin().read(&mut []);
def_syn_loader_conf
});
let syn_loader = std::sync::Arc::new(syntax::Loader::new(syn_loader_conf)); let syn_loader = std::sync::Arc::new(syntax::Loader::new(syn_loader_conf));
let mut editor = Editor::new( let mut editor = Editor::new(