Switch to Result for invalid language

jdrst · Sep 13, 2022 · 6da826e · 6da826e
1 parent a1b99d9
commit 6da826e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/helix-term/src/commands/typed.rs b/helix-term/src/commands/typed.rs
@@ -1254,14 +1254,10 @@ fn language(
 
     let doc = doc_mut!(cx.editor);
 
-    let loader = cx.editor.syn_loader.clone();
     if args[0] == "text" {
-        doc.set_language(None, Some(loader))
+        doc.set_language(None, None)
     } else {
-        let ok = doc.set_language_by_language_id(&args[0], loader);
-        if !ok {
-            anyhow::bail!("invalid language: {}", args[0]);
-        }
+        doc.set_language_by_language_id(&args[0], cx.editor.syn_loader.clone())?;
     }
     doc.detect_indent_and_line_ending();
 

diff --git a/helix-view/src/document.rs b/helix-view/src/document.rs
@@ -683,13 +683,12 @@ impl Document {
         &mut self,
         language_id: &str,
         config_loader: Arc<syntax::Loader>,
-    ) -> bool {
-        let language_config = config_loader.language_config_for_language_id(language_id);
-        if language_config.is_none() {
-            return false;
-        }
-        self.set_language(language_config, Some(config_loader));
-        true
+    ) -> anyhow::Result<()> {
+        let language_config = config_loader
+            .language_config_for_language_id(language_id)
+            .ok_or_else(|| anyhow!("invalid language id: {}", language_id))?;
+        self.set_language(Some(language_config), Some(config_loader));
+        Ok(())
     }
 
     /// Set the LSP.