-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into ilyakooo0:iko/init-hoon
- Loading branch information
Showing
27 changed files
with
534 additions
and
254 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,45 @@ | ||
| /// Syntax configuration loader based on built-in languages.toml. | ||
| pub fn default_syntax_loader() -> crate::syntax::Configuration { | ||
| use crate::syntax::{Configuration, Loader, LoaderError}; | ||
|
|
||
| /// Language configuration based on built-in languages.toml. | ||
| pub fn default_lang_config() -> Configuration { | ||
| helix_loader::config::default_lang_config() | ||
| .try_into() | ||
| .expect("Could not serialize built-in languages.toml") | ||
| .expect("Could not deserialize built-in languages.toml") | ||
| } | ||
| /// Syntax configuration loader based on user configured languages.toml. | ||
| pub fn user_syntax_loader() -> Result<crate::syntax::Configuration, toml::de::Error> { | ||
|
|
||
| /// Language configuration loader based on built-in languages.toml. | ||
| pub fn default_lang_loader() -> Loader { | ||
| Loader::new(default_lang_config()).expect("Could not compile loader for default config") | ||
| } | ||
|
|
||
| #[derive(Debug)] | ||
| pub enum LanguageLoaderError { | ||
| DeserializeError(toml::de::Error), | ||
| LoaderError(LoaderError), | ||
| } | ||
|
|
||
| impl std::fmt::Display for LanguageLoaderError { | ||
| fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { | ||
| match self { | ||
| Self::DeserializeError(err) => write!(f, "Failed to parse language config: {err}"), | ||
| Self::LoaderError(err) => write!(f, "Failed to compile language config: {err}"), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl std::error::Error for LanguageLoaderError {} | ||
|
|
||
| /// Language configuration based on user configured languages.toml. | ||
| pub fn user_lang_config() -> Result<Configuration, toml::de::Error> { | ||
| helix_loader::config::user_lang_config()?.try_into() | ||
| } | ||
|
|
||
| /// Language configuration loader based on user configured languages.toml. | ||
| pub fn user_lang_loader() -> Result<Loader, LanguageLoaderError> { | ||
| let config: Configuration = helix_loader::config::user_lang_config() | ||
| .map_err(LanguageLoaderError::DeserializeError)? | ||
| .try_into() | ||
| .map_err(LanguageLoaderError::DeserializeError)?; | ||
|
|
||
| Loader::new(config).map_err(LanguageLoaderError::LoaderError) | ||
| } |
Oops, something went wrong.