chore: bump tree-sitter version

Author: HerringtonDarkholme

Cargo.lock

@@ -21,5 +21,5 @@ readme = "README.md"
 
 [workspace.dependencies]
 web-tree-sitter-sg = { path = "crates/web-tree-sitter-sg" }
-tree-sitter = { version = "0.24.4" }
+tree-sitter = { version = "0.25.3" }
 tree-sitter-language = { version = "0.1" }

Cargo.toml

@@ -50,8 +50,8 @@ mod native {
         }
 
         #[inline]
-        pub fn version(&self) -> u32 {
-            u32::try_from(self.inner.version()).unwrap()
+        pub fn abi_version(&self) -> u32 {
+            u32::try_from(self.inner.abi_version()).unwrap()
         }
     }
 
@@ -148,8 +148,8 @@ mod wasm {
         }
 
         #[inline]
-        pub fn version(&self) -> u32 {
-            self.inner.version()
+        pub fn abi_version(&self) -> u32 {
+            self.inner.abi_version()
         }
     }
 

crates/tree-sitter-facade/src/language.rs

@@ -10,7 +10,6 @@ mod native {
         range::Range,
         tree::Tree,
     };
-    use core::sync::atomic::AtomicUsize;
     use std::convert::TryFrom;
 
     pub struct Parser {
@@ -33,12 +32,6 @@ mod native {
         //     self.inner.take_wasm_store()
         // }
 
-        #[allow(clippy::missing_safety_doc)]
-        #[inline]
-        pub unsafe fn cancellation_flag(&self) -> Option<&AtomicUsize> {
-            self.inner.cancellation_flag()
-        }
-
         #[inline]
         pub fn language(&self) -> Option<Language> {
             self.inner.language().map(|l| (*l).clone()).map(Into::into)
@@ -56,17 +49,17 @@ mod native {
         }
 
         #[inline]
-        pub fn parse_utf16(
+        pub fn parse_utf16_le(
             &mut self,
             text: impl AsRef<[u16]>,
             old_tree: Option<&Tree>,
         ) -> Result<Option<Tree>, ParserError> {
             let old_tree = old_tree.map(|tree| &tree.inner);
-            Ok(self.inner.parse_utf16(text, old_tree).map(Into::into))
+            Ok(self.inner.parse_utf16_le(text, old_tree).map(Into::into))
         }
 
         #[inline]
-        pub fn parse_utf16_with<T>(
+        pub fn parse_utf16_le_with<T>(
             &mut self,
             mut callback: impl FnMut(u32, Point) -> T,
             old_tree: Option<&Tree>,
@@ -76,7 +69,7 @@ mod native {
         {
             let mut callback = |offset, inner| callback(u32::try_from(offset).unwrap(), Point { inner });
             let old_tree = old_tree.map(|tree| &tree.inner);
-            Ok(self.inner.parse_utf16_with(&mut callback, old_tree).map(Into::into))
+            Ok(self.inner.parse_utf16_le_with_options(&mut callback, old_tree, None).map(Into::into))
         }
 
         #[inline]
@@ -90,7 +83,7 @@ mod native {
         {
             let mut callback = |offset, inner| callback(u32::try_from(offset).unwrap(), Point { inner });
             let old_tree = old_tree.map(|tree| &tree.inner);
-            Ok(self.inner.parse_with(&mut callback, old_tree).map(Into::into))
+            Ok(self.inner.parse_with_options(&mut callback, old_tree, None).map(Into::into))
         }
 
         #[cfg(unix)]
@@ -104,12 +97,6 @@ mod native {
             self.inner.reset()
         }
 
-        #[allow(clippy::missing_safety_doc)]
-        #[inline]
-        pub unsafe fn set_cancellation_flag(&mut self, flag: Option<&AtomicUsize>) {
-            self.inner.set_cancellation_flag(flag);
-        }
-
         #[inline]
         pub fn set_included_ranges(&mut self, ranges: &[Range]) -> Result<(), IncludedRangesError> {
             let ranges = ranges.iter().map(|range| range.inner).collect::<Vec<_>>();
@@ -127,20 +114,10 @@ mod native {
             self.inner.set_logger(logger)
         }
 
-        #[inline]
-        pub fn set_timeout_micros(&mut self, timeout_micros: f64) {
-            self.inner.set_timeout_micros(timeout_micros as u64)
-        }
-
         #[inline]
         pub fn stop_printing_dot_graphs(&mut self) {
             self.inner.stop_printing_dot_graphs()
         }
-
-        #[inline]
-        pub fn timeout_micros(&self) -> f64 {
-            self.inner.timeout_micros() as f64
-        }
     }
 
     impl From<tree_sitter::Parser> for Parser {
@@ -235,26 +212,26 @@ mod wasm {
                 .map_err(Into::into)
         }
 
-        // #[inline]
-        // pub fn parse_utf16(
-        //     &mut self,
-        //     text: impl AsRef<[u16]>,
-        //     old_tree: Option<&Tree>,
-        // ) -> Result<Option<Tree>, ParserError> {
-        //     unimplemented!()
-        // }
+        #[inline]
+        pub fn parse_utf16_le(
+            &mut self,
+            _text: impl AsRef<[u16]>,
+            _old_tree: Option<&Tree>,
+        ) -> Result<Option<Tree>, ParserError> {
+            unimplemented!()
+        }
 
-        // #[inline]
-        // pub fn parse_utf16_with<T>(
-        //     &mut self,
-        //     callback: impl FnMut(u32, Point) -> T + 'static,
-        //     old_tree: Option<&Tree>,
-        // ) -> Result<Option<Tree>, ParserError>
-        // where
-        //     T: AsRef<[u16]>,
-        // {
-        //     unimplemented!()
-        // }
+        #[inline]
+        pub fn parse_utf16_le_with<T>(
+            &mut self,
+            _callback: impl FnMut(u32, Point) -> T + 'static,
+            _old_tree: Option<&Tree>,
+        ) -> Result<Option<Tree>, ParserError>
+        where
+            T: AsRef<[u16]>,
+        {
+            unimplemented!()
+        }
 
         #[inline]
         pub fn parse_with<T>(

crates/tree-sitter-facade/src/parser.rs

@@ -169,8 +169,8 @@ extern {
 
     // Instance Properties
 
-    #[wasm_bindgen(method, getter)]
-    pub fn version(this: &Language) -> u32;
+    #[wasm_bindgen(method, getter, js_name = abiVersion)]
+    pub fn abi_version(this: &Language) -> u32;
 
     #[wasm_bindgen(method, getter, js_name = fieldCount)]
     pub fn field_count(this: &Language) -> u16;

crates/web-tree-sitter-sg/src/lib.rs

@@ -24,11 +24,11 @@ async fn load_path() {
 }
 
 #[wasm_bindgen_test]
-async fn version() {
+async fn abi_version() {
     async fn inner() -> Result<(), JsValue> {
         TreeSitter::init().await?;
         let language = crate::util::language::load().await?;
-        assert_eq!(14, language.version());
+        assert_eq!(14, language.abi_version());
         Ok(())
     }
     assert!(inner().await.is_ok());