Simplify TextObject cell init

helix-editor · Oct 6, 2021 · a652a1e · a652a1e
1 parent 5ea3f6f
commit a652a1e
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
@@ -211,14 +211,12 @@ 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 })
+            .get_or_init(|| -> Option<TextObjectQuery> {
+                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()
     }