From 361841c0b9f13b99c4e728154e8494845b0378ab Mon Sep 17 00:00:00 2001 From: Gokul Soumya Date: Wed, 6 Oct 2021 15:31:46 +0530 Subject: [PATCH] Simplify TextObject cell init --- helix-core/src/syntax.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs index 5a760bea39a7e..e7386d0c4e22e 100644 --- a/helix-core/src/syntax.rs +++ b/helix-core/src/syntax.rs @@ -212,13 +212,11 @@ impl LanguageConfiguration { pub fn textobject_query(&self) -> Option<&TextObjectQuery> { self.textobject_query .get_or_init(|| { - let language = self.language_id.to_ascii_lowercase(); - let query = read_query(&language, "textobjects.scm"); - self.highlight_config - .get() - .and_then(|config| config.as_ref().map(|c| c.language)) - .and_then(move |lang| Query::new(lang, &query).ok()) - .map(|query| TextObjectQuery { query }) + let lang_name = self.language_id.to_ascii_lowercase(); + let query_text = read_query(&lang_name, "textobjects.scm"); + let lang = self.highlight_config.get()?.as_ref()?.language; + let query = Query::new(lang, &query_text).ok()?; + Some(TextObjectQuery { query }) }) .as_ref() }