mirrors/helix
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2025-04-05 11:57:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

minor: Simplify some code.

Browse source
This commit is contained in:
Blaž Hrastnik 2021-02-24 16:07:39 +09:00
parent c6456d04b9
commit 87a6d4e736
7 changed files with 44 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

13
helix-core/src/syntax.rs
View file

@ -27,12 +27,9 @@ pub struct LanguageConfiguration {
}
impl LanguageConfiguration {
pub fn highlight_config(
&self,
scopes: &[String],
) -> Result<Option<&Arc<HighlightConfiguration>>, anyhow::Error> {
pub fn highlight_config(&self, scopes: &[String]) -> Option<Arc<HighlightConfiguration>> {
self.highlight_config
.get_or_try_init(|| {
.get_or_init(|| {
// let name = get_language_name(&self.language_id);
let highlights_query =
@ -46,7 +43,7 @@ impl LanguageConfiguration {
let locals_query = "";
if highlights_query.is_empty() {
Ok(None)
None
} else {
let language = get_language(self.language_id);
let mut config = HighlightConfiguration::new(
@ -57,10 +54,10 @@ impl LanguageConfiguration {
)
.unwrap(); // TODO: no unwrap
config.configure(&scopes);
Ok(Some(Arc::new(config)))
Some(Arc::new(config))
}
})
.map(Option::as_ref)
.clone()
}
pub fn scope(&self) -> &str {