feat: Add support for loading tree-sitter-language grammars

bindings/Cargo.toml

@@ -11,12 +11,14 @@ rust-version = "1.76.0"
 
 [features]
 ropey = ["dep:ropey"]
+tree-sitter-language = ["dep:tree-sitter-language"]
 
 [dependencies]
 ropey = { version = "1.6", default-features = false, optional=true }
 regex-cursor = "0.1.5"
 libloading = "0.8"
 thiserror = "2.0"
+tree-sitter-language = { version = "0.1.5", optional = true }
 
 [build-dependencies]
 cc = "1.0"

bindings/src/grammar.rs

@@ -3,6 +3,8 @@ use std::path::{Path, PathBuf};
 use std::ptr::NonNull;
 
 use libloading::{Library, Symbol};
+#[cfg(feature = "tree-sitter-language")]
+use tree_sitter_language::LanguageFn;
 
 /// Lowest supported ABI version of a grammar.
 // WARNING: update when updating vendored c sources
@@ -44,18 +46,21 @@ impl Grammar {
             })?
         };
         let language_fn_name = format!("tree_sitter_{}", name.replace('-', "_"));
-        let grammar = unsafe {
-            let language_fn: Symbol<unsafe extern "C" fn() -> NonNull<GrammarData>> = library
-                .get(language_fn_name.as_bytes())
-                .map_err(|err| Error::DlSym {
-                    err,
-                    symbol: name.to_owned(),
-                })?;
-            Grammar { ptr: language_fn() }
-        };
+        let language_fn: Symbol<unsafe extern "C" fn() -> NonNull<GrammarData>> = library
+            .get(language_fn_name.as_bytes())
+            .map_err(|err| Error::DlSym {
+                err,
+                symbol: name.to_owned(),
+            })?;
+        let grammar = Grammar::from_grammar_data(language_fn())?;
+        std::mem::forget(library);
+        Ok(grammar)
+    }
+
+    fn from_grammar_data(ptr: NonNull<GrammarData>) -> Result<Grammar, Error> {
+        let grammar = Grammar { ptr };
         let version = grammar.abi_version();
         if (MIN_COMPATIBLE_ABI_VERSION..=ABI_VERSION).contains(&version) {
-            std::mem::forget(library);
             Ok(grammar)
         } else {
             Err(Error::IncompatibleVersion { version })
@@ -72,6 +77,16 @@ impl Grammar {
     }
 }
 
+#[cfg(feature = "tree-sitter-language")]
+impl TryFrom<LanguageFn> for Grammar {
+    type Error = Error;
+
+    fn try_from(builder: LanguageFn) -> Result<Self, Self::Error> {
+        let ptr = unsafe { NonNull::new_unchecked(builder.into_raw()().cast_mut().cast()) };
+        Self::from_grammar_data(ptr)
+    }
+}
+
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     #[error("Error opening dynamic library {path:?}")]