diff --git a/crates/tree-sitter-facade/src/lib.rs b/crates/tree-sitter-facade/src/lib.rs index c296325..77516cd 100644 --- a/crates/tree-sitter-facade/src/lib.rs +++ b/crates/tree-sitter-facade/src/lib.rs @@ -29,6 +29,9 @@ pub use tree_cursor::*; use wasm_bindgen::prelude::*; +#[cfg(target_arch = "wasm32")] +pub use js_sys::Object; + pub struct TreeSitter; impl TreeSitter { @@ -38,7 +41,7 @@ impl TreeSitter { } #[cfg(target_arch = "wasm32")] - pub async fn init() -> Result<(), JsError> { - web_tree_sitter_sg::TreeSitter::init().await + pub async fn init(options: Option) -> Result<(), JsError> { + web_tree_sitter_sg::TreeSitter::init(options).await } } diff --git a/crates/web-tree-sitter-sg/src/lib.rs b/crates/web-tree-sitter-sg/src/lib.rs index d3a5d08..cf7098b 100644 --- a/crates/web-tree-sitter-sg/src/lib.rs +++ b/crates/web-tree-sitter-sg/src/lib.rs @@ -41,7 +41,7 @@ thread_local! { pub struct TreeSitter; impl TreeSitter { - pub async fn init() -> Result<(), JsError> { + pub async fn init(options: Option) -> Result<(), JsError> { #![allow(non_snake_case)] // Exit early if `web-tree-sitter` is already initialized @@ -49,7 +49,7 @@ impl TreeSitter { return Ok(()); } - JsFuture::from(Parser::init()).await.lift_error()?; + JsFuture::from(Parser::init(options)).await.lift_error()?; // Set `web-tree-sitter` to initialized TREE_SITTER_INITIALIZED.with(|cell| cell.replace(true)); @@ -857,7 +857,7 @@ extern { // Static Methods #[wasm_bindgen(static_method_of = Parser)] - pub fn init() -> Promise; + pub fn init(options: Option) -> Promise; // Constructor diff --git a/crates/web-tree-sitter-sg/tests/node/edit.rs b/crates/web-tree-sitter-sg/tests/node/edit.rs index e51b1de..755681c 100644 --- a/crates/web-tree-sitter-sg/tests/node/edit.rs +++ b/crates/web-tree-sitter-sg/tests/node/edit.rs @@ -5,7 +5,7 @@ use web_tree_sitter_sg::*; #[wasm_bindgen_test] async fn new() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let _edit = ::default(); Ok(()) } @@ -15,7 +15,7 @@ async fn new() { #[wasm_bindgen_test] async fn start_index() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let edit = ::default(); let _ = edit.start_index(); Ok(()) @@ -26,7 +26,7 @@ async fn start_index() { #[wasm_bindgen_test] async fn old_end_index() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let edit = ::default(); let _ = edit.old_end_index(); Ok(()) @@ -37,7 +37,7 @@ async fn old_end_index() { #[wasm_bindgen_test] async fn new_end_index() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let edit = ::default(); let _ = edit.new_end_index(); Ok(()) @@ -48,7 +48,7 @@ async fn new_end_index() { #[wasm_bindgen_test] async fn start_position() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let edit = ::default(); let _ = edit.new_end_index(); Ok(()) @@ -59,7 +59,7 @@ async fn start_position() { #[wasm_bindgen_test] async fn old_end_position() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let edit = ::default(); let _ = edit.new_end_index(); Ok(()) @@ -70,7 +70,7 @@ async fn old_end_position() { #[wasm_bindgen_test] async fn new_end_position() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let edit = ::default(); let _ = edit.new_end_index(); Ok(()) diff --git a/crates/web-tree-sitter-sg/tests/node/language.rs b/crates/web-tree-sitter-sg/tests/node/language.rs index 12fe8f0..e27eb57 100644 --- a/crates/web-tree-sitter-sg/tests/node/language.rs +++ b/crates/web-tree-sitter-sg/tests/node/language.rs @@ -5,7 +5,7 @@ use web_tree_sitter_sg::*; #[wasm_bindgen_test] async fn load_bytes() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let bytes: &[u8] = include_bytes!("../tree-sitter-javascript.wasm"); web_tree_sitter_sg::Language::load_bytes(&bytes.into()).await?; Ok(()) @@ -16,7 +16,7 @@ async fn load_bytes() { #[wasm_bindgen_test] async fn load_path() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; crate::util::language::load().await?; Ok(()) } @@ -26,7 +26,7 @@ async fn load_path() { #[wasm_bindgen_test] async fn abi_version() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let language = crate::util::language::load().await?; assert_eq!(14, language.abi_version()); Ok(()) @@ -37,7 +37,7 @@ async fn abi_version() { #[wasm_bindgen_test] async fn field_count() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let language = crate::util::language::load().await?; assert_eq!(38, language.field_count()); Ok(()) @@ -48,7 +48,7 @@ async fn field_count() { #[wasm_bindgen_test] async fn node_kind_count() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let language = crate::util::language::load().await?; assert_eq!(271, language.node_kind_count()); Ok(()) @@ -59,7 +59,7 @@ async fn node_kind_count() { #[wasm_bindgen_test] async fn field_name_for_id() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let language = crate::util::language::load().await?; assert_eq!(Some(13), language.field_id_for_name("decorator")); Ok(()) @@ -70,7 +70,7 @@ async fn field_name_for_id() { #[wasm_bindgen_test] async fn field_id_for_name() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let language = crate::util::language::load().await?; assert_eq!(Some("decorator".into()), language.field_name_for_id(13)); Ok(()) @@ -81,7 +81,7 @@ async fn field_id_for_name() { #[wasm_bindgen_test] async fn id_for_node_kind() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let language = crate::util::language::load().await?; let kind = "export_statement"; let named = true; @@ -94,7 +94,7 @@ async fn id_for_node_kind() { #[wasm_bindgen_test] async fn node_kind_for_id() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let language = crate::util::language::load().await?; let kind_id = 137; assert_eq!(Some("export_statement".into()), language.node_kind_for_id(kind_id)); @@ -107,7 +107,7 @@ async fn node_kind_for_id() { async fn node_kind_is_named() { #[allow(clippy::bool_assert_comparison)] async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let language = crate::util::language::load().await?; let kind_id = 4; assert_eq!(Some("*".into()), language.node_kind_for_id(kind_id)); @@ -121,7 +121,7 @@ async fn node_kind_is_named() { async fn node_kind_is_visible() { #[allow(clippy::bool_assert_comparison)] async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let language = crate::util::language::load().await?; let kind_id = 267; assert_eq!(true, language.node_kind_is_visible(kind_id)); @@ -137,7 +137,7 @@ async fn node_kind_is_visible() { #[wasm_bindgen_test] async fn query() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let language = crate::util::language::load().await?; let query = r###" (function_declaration name: (identifier) @fn-def) @@ -153,7 +153,7 @@ async fn query() { #[wasm_bindgen_test] async fn query_throws() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let language = crate::util::language::load().await?; let query = r###" (function_declaration wat) diff --git a/crates/web-tree-sitter-sg/tests/node/parse_options.rs b/crates/web-tree-sitter-sg/tests/node/parse_options.rs index 02a6b82..d7714f7 100644 --- a/crates/web-tree-sitter-sg/tests/node/parse_options.rs +++ b/crates/web-tree-sitter-sg/tests/node/parse_options.rs @@ -5,7 +5,7 @@ use web_tree_sitter_sg::*; #[wasm_bindgen_test] async fn new() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let _options = ::default(); Ok(()) } @@ -15,7 +15,7 @@ async fn new() { #[wasm_bindgen_test] async fn included_ranges() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let options = ::default(); let _included_ranges = options.included_ranges(); Ok(()) diff --git a/crates/web-tree-sitter-sg/tests/node/parser.rs b/crates/web-tree-sitter-sg/tests/node/parser.rs index de87dfc..4e7e89e 100644 --- a/crates/web-tree-sitter-sg/tests/node/parser.rs +++ b/crates/web-tree-sitter-sg/tests/node/parser.rs @@ -8,7 +8,7 @@ use web_tree_sitter_sg::*; #[wasm_bindgen_test] async fn new() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let _parser = Parser::new()?; Ok(()) } @@ -18,7 +18,7 @@ async fn new() { #[wasm_bindgen_test] async fn delete() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let parser = Parser::new()?; parser.delete(); Ok(()) @@ -29,7 +29,7 @@ async fn delete() { #[wasm_bindgen_test] async fn parse_with_function() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let parser = Parser::new()?; let language = crate::util::language::load().await?; parser.set_language(Some(&language))?; @@ -49,7 +49,7 @@ async fn parse_with_function() { #[wasm_bindgen_test] async fn parse_with_string() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let parser = Parser::new()?; let language = crate::util::language::load().await?; parser.set_language(Some(&language))?; @@ -67,7 +67,7 @@ async fn parse_with_string() { #[wasm_bindgen_test] async fn reset() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let parser = Parser::new()?; parser.reset(); Ok(()) @@ -78,7 +78,7 @@ async fn reset() { #[wasm_bindgen_test] async fn set_get_language() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let parser = Parser::new()?; let language = crate::util::language::load().await?; @@ -96,7 +96,7 @@ async fn set_get_language() { #[wasm_bindgen_test] async fn set_get_logger() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let parser = Parser::new()?; let language = crate::util::language::load().await?; parser.set_language(Some(&language))?; diff --git a/crates/web-tree-sitter-sg/tests/node/point.rs b/crates/web-tree-sitter-sg/tests/node/point.rs index aa5a6db..5527bd9 100644 --- a/crates/web-tree-sitter-sg/tests/node/point.rs +++ b/crates/web-tree-sitter-sg/tests/node/point.rs @@ -5,7 +5,7 @@ use web_tree_sitter_sg::*; #[wasm_bindgen_test] async fn new() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let _point = ::default(); Ok(()) } @@ -15,7 +15,7 @@ async fn new() { #[wasm_bindgen_test] async fn row() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let point = ::default(); let _row = point.row(); Ok(()) @@ -26,7 +26,7 @@ async fn row() { #[wasm_bindgen_test] async fn column() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let point = ::default(); let _column = point.column(); Ok(()) diff --git a/crates/web-tree-sitter-sg/tests/node/predicate_operand.rs b/crates/web-tree-sitter-sg/tests/node/predicate_operand.rs index 1488db7..62fda98 100644 --- a/crates/web-tree-sitter-sg/tests/node/predicate_operand.rs +++ b/crates/web-tree-sitter-sg/tests/node/predicate_operand.rs @@ -5,7 +5,7 @@ use web_tree_sitter_sg::*; #[wasm_bindgen_test] async fn name() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let parser = Parser::new()?; let language = crate::util::language::load().await?; parser.set_language(Some(&language))?; @@ -36,7 +36,7 @@ async fn name() { #[wasm_bindgen_test] async fn type_() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let parser = Parser::new()?; let language = crate::util::language::load().await?; parser.set_language(Some(&language))?; diff --git a/crates/web-tree-sitter-sg/tests/node/predicate_result.rs b/crates/web-tree-sitter-sg/tests/node/predicate_result.rs index 380e7d2..4c6bc15 100644 --- a/crates/web-tree-sitter-sg/tests/node/predicate_result.rs +++ b/crates/web-tree-sitter-sg/tests/node/predicate_result.rs @@ -5,7 +5,7 @@ use web_tree_sitter_sg::*; #[wasm_bindgen_test] async fn operator() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let parser = Parser::new()?; let language = crate::util::language::load().await?; parser.set_language(Some(&language))?; @@ -34,7 +34,7 @@ async fn operator() { #[wasm_bindgen_test] async fn operands() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let parser = Parser::new()?; let language = crate::util::language::load().await?; parser.set_language(Some(&language))?; diff --git a/crates/web-tree-sitter-sg/tests/node/query.rs b/crates/web-tree-sitter-sg/tests/node/query.rs index e64a47c..3fb57b5 100644 --- a/crates/web-tree-sitter-sg/tests/node/query.rs +++ b/crates/web-tree-sitter-sg/tests/node/query.rs @@ -5,7 +5,7 @@ use web_tree_sitter_sg::*; #[wasm_bindgen_test] async fn capture_names() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let (_, _, query) = crate::util::language::query().await?; assert_eq!( vec!["fn-def".into(), "fn-ref".into()].into_boxed_slice(), @@ -19,7 +19,7 @@ async fn capture_names() { #[wasm_bindgen_test] async fn delete() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let (_, _, query) = crate::util::language::query().await?; query.delete(); Ok(()) @@ -30,7 +30,7 @@ async fn delete() { #[wasm_bindgen_test] async fn matches() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let (parser, _, query) = crate::util::language::query().await?; let tree = { let input = "function one() { two(); function three() {} }".into(); @@ -53,7 +53,7 @@ async fn matches() { #[wasm_bindgen_test] async fn captures() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let (parser, _, query) = crate::util::language::query().await?; let tree = { let input = "function one() { two(); function three() {} }".into(); @@ -76,7 +76,7 @@ async fn captures() { #[wasm_bindgen_test] async fn predicates_for_pattern() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let parser = Parser::new()?; let language = crate::util::language::load().await?; parser.set_language(Some(&language))?; diff --git a/crates/web-tree-sitter-sg/tests/node/query_capture.rs b/crates/web-tree-sitter-sg/tests/node/query_capture.rs index af72c4d..97e27d2 100644 --- a/crates/web-tree-sitter-sg/tests/node/query_capture.rs +++ b/crates/web-tree-sitter-sg/tests/node/query_capture.rs @@ -5,7 +5,7 @@ use web_tree_sitter_sg::*; #[wasm_bindgen_test] async fn name() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let (parser, _, query) = crate::util::language::query().await?; let tree = { let input = "function one() { two(); function three() {} }".into(); @@ -30,7 +30,7 @@ async fn name() { #[wasm_bindgen_test] async fn node() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let (parser, _, query) = crate::util::language::query().await?; let tree = { let input = "function one() { two(); function three() {} }".into(); diff --git a/crates/web-tree-sitter-sg/tests/node/query_match.rs b/crates/web-tree-sitter-sg/tests/node/query_match.rs index dd8a20f..bcfab51 100644 --- a/crates/web-tree-sitter-sg/tests/node/query_match.rs +++ b/crates/web-tree-sitter-sg/tests/node/query_match.rs @@ -5,7 +5,7 @@ use web_tree_sitter_sg::*; #[wasm_bindgen_test] async fn name() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let (parser, _, query) = crate::util::language::query().await?; let tree = { let input = "function one() { two(); function three() {} }".into(); @@ -30,7 +30,7 @@ async fn name() { #[wasm_bindgen_test] async fn node() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let (parser, _, query) = crate::util::language::query().await?; let tree = { let input = "function one() { two(); function three() {} }".into(); diff --git a/crates/web-tree-sitter-sg/tests/node/range.rs b/crates/web-tree-sitter-sg/tests/node/range.rs index cc3bc99..80420ab 100644 --- a/crates/web-tree-sitter-sg/tests/node/range.rs +++ b/crates/web-tree-sitter-sg/tests/node/range.rs @@ -5,7 +5,7 @@ use web_tree_sitter_sg::*; #[wasm_bindgen_test] async fn new() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let _range = ::default(); Ok(()) } @@ -15,7 +15,7 @@ async fn new() { #[wasm_bindgen_test] async fn start_position() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let range = ::default(); let _start_position = range.start_position(); Ok(()) @@ -26,7 +26,7 @@ async fn start_position() { #[wasm_bindgen_test] async fn end_position() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let range = ::default(); let _end_position = range.end_position(); Ok(()) @@ -37,7 +37,7 @@ async fn end_position() { #[wasm_bindgen_test] async fn start_index() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let range = ::default(); let _start_index = range.start_index(); Ok(()) @@ -48,7 +48,7 @@ async fn start_index() { #[wasm_bindgen_test] async fn end_index() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let range = ::default(); let _end_index = range.end_index(); Ok(()) diff --git a/crates/web-tree-sitter-sg/tests/node/syntax_node.rs b/crates/web-tree-sitter-sg/tests/node/syntax_node.rs index 71f8be1..037251c 100644 --- a/crates/web-tree-sitter-sg/tests/node/syntax_node.rs +++ b/crates/web-tree-sitter-sg/tests/node/syntax_node.rs @@ -5,7 +5,7 @@ use web_tree_sitter_sg::*; #[wasm_bindgen_test] async fn id() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.id(); Ok(()) @@ -16,7 +16,7 @@ async fn id() { #[wasm_bindgen_test] async fn tree() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.tree(); Ok(()) @@ -27,7 +27,7 @@ async fn tree() { #[wasm_bindgen_test] async fn type_() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.type_(); Ok(()) @@ -38,7 +38,7 @@ async fn type_() { #[wasm_bindgen_test] async fn type_id() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.type_id(); Ok(()) @@ -49,7 +49,7 @@ async fn type_id() { #[wasm_bindgen_test] async fn text() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.text(); Ok(()) @@ -60,7 +60,7 @@ async fn text() { #[wasm_bindgen_test] async fn start_position() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.start_position(); Ok(()) @@ -71,7 +71,7 @@ async fn start_position() { #[wasm_bindgen_test] async fn end_position() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.end_position(); Ok(()) @@ -82,7 +82,7 @@ async fn end_position() { #[wasm_bindgen_test] async fn start_index() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.start_index(); Ok(()) @@ -93,7 +93,7 @@ async fn start_index() { #[wasm_bindgen_test] async fn end_index() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.end_index(); Ok(()) @@ -104,7 +104,7 @@ async fn end_index() { #[wasm_bindgen_test] async fn parent() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.parent(); Ok(()) @@ -115,7 +115,7 @@ async fn parent() { #[wasm_bindgen_test] async fn children() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.children(); Ok(()) @@ -126,7 +126,7 @@ async fn children() { #[wasm_bindgen_test] async fn named_children() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.named_children(); Ok(()) @@ -137,7 +137,7 @@ async fn named_children() { #[wasm_bindgen_test] async fn child_count() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.child_count(); Ok(()) @@ -148,7 +148,7 @@ async fn child_count() { #[wasm_bindgen_test] async fn named_child_count() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.named_child_count(); Ok(()) @@ -159,7 +159,7 @@ async fn named_child_count() { #[wasm_bindgen_test] async fn first_child() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.first_child(); Ok(()) @@ -170,7 +170,7 @@ async fn first_child() { #[wasm_bindgen_test] async fn first_named_child() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.first_named_child(); Ok(()) @@ -181,7 +181,7 @@ async fn first_named_child() { #[wasm_bindgen_test] async fn last_child() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.last_child(); Ok(()) @@ -192,7 +192,7 @@ async fn last_child() { #[wasm_bindgen_test] async fn last_named_child() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.last_named_child(); Ok(()) @@ -203,7 +203,7 @@ async fn last_named_child() { #[wasm_bindgen_test] async fn next_sibling() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.next_sibling(); Ok(()) @@ -214,7 +214,7 @@ async fn next_sibling() { #[wasm_bindgen_test] async fn next_named_sibling() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.next_named_sibling(); Ok(()) @@ -225,7 +225,7 @@ async fn next_named_sibling() { #[wasm_bindgen_test] async fn previous_sibling() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.previous_sibling(); Ok(()) @@ -236,7 +236,7 @@ async fn previous_sibling() { #[wasm_bindgen_test] async fn previous_named_sibling() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.previous_named_sibling(); Ok(()) @@ -247,7 +247,7 @@ async fn previous_named_sibling() { #[wasm_bindgen_test] async fn has_changes() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.has_changes(); Ok(()) @@ -258,7 +258,7 @@ async fn has_changes() { #[wasm_bindgen_test] async fn has_error() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.has_error(); Ok(()) @@ -269,7 +269,7 @@ async fn has_error() { #[wasm_bindgen_test] async fn is_error() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.is_error(); Ok(()) @@ -280,7 +280,7 @@ async fn is_error() { #[wasm_bindgen_test] async fn equals() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); assert!(node.equals(&node)); Ok(()) @@ -291,7 +291,7 @@ async fn equals() { #[wasm_bindgen_test] async fn is_missing() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.is_missing(); Ok(()) @@ -302,7 +302,7 @@ async fn is_missing() { #[wasm_bindgen_test] async fn is_named() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.is_named(); Ok(()) @@ -313,7 +313,7 @@ async fn is_named() { #[wasm_bindgen_test] async fn to_string() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _ = node.to_string(); Ok(()) @@ -324,7 +324,7 @@ async fn to_string() { #[wasm_bindgen_test] async fn child() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let field_id = Default::default(); let _ = node.child(field_id); @@ -336,7 +336,7 @@ async fn child() { #[wasm_bindgen_test] async fn named_child() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let field_id = Default::default(); let _ = node.named_child(field_id); @@ -348,7 +348,7 @@ async fn named_child() { #[wasm_bindgen_test] async fn child_for_field_id() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let field_id = Default::default(); let _ = node.child_for_field_id(field_id); @@ -360,7 +360,7 @@ async fn child_for_field_id() { #[wasm_bindgen_test] async fn child_for_field_name() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let field_name = Default::default(); let _ = node.child_for_field_name(field_name); @@ -372,7 +372,7 @@ async fn child_for_field_name() { #[wasm_bindgen_test] async fn child_with_descendant() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let descendant = crate::util::syntax_node::make().await?.unwrap(); let _ = node.child_with_descendant(&descendant); @@ -384,7 +384,7 @@ async fn child_with_descendant() { #[wasm_bindgen_test] async fn descendant_for_index() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let index = Default::default(); let _ = node.descendant_for_index(index); @@ -396,7 +396,7 @@ async fn descendant_for_index() { #[wasm_bindgen_test] async fn descendant_for_index_range() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let start_index = Default::default(); let end_index = Default::default(); @@ -409,7 +409,7 @@ async fn descendant_for_index_range() { #[wasm_bindgen_test] async fn descendant_of_type_string() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let type_ = Default::default(); let start_position = Default::default(); @@ -423,7 +423,7 @@ async fn descendant_of_type_string() { #[wasm_bindgen_test] async fn descendant_of_type_array() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let type_ = Default::default(); let start_position = Default::default(); @@ -437,7 +437,7 @@ async fn descendant_of_type_array() { #[wasm_bindgen_test] async fn named_descendant_for_index() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let index = Default::default(); let _ = node.named_descendant_for_index(index); @@ -449,7 +449,7 @@ async fn named_descendant_for_index() { #[wasm_bindgen_test] async fn named_descendant_for_index_range() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let start_index = Default::default(); let end_index = Default::default(); @@ -462,7 +462,7 @@ async fn named_descendant_for_index_range() { #[wasm_bindgen_test] async fn descendant_for_position() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let position = Default::default(); let _ = node.descendant_for_position(&position); @@ -474,7 +474,7 @@ async fn descendant_for_position() { #[wasm_bindgen_test] async fn descendant_for_position_range() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let start_position = Default::default(); let end_position = Default::default(); @@ -487,7 +487,7 @@ async fn descendant_for_position_range() { #[wasm_bindgen_test] async fn named_descendant_for_position() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let position = Default::default(); let _node = node.named_descendant_for_position(&position); @@ -499,7 +499,7 @@ async fn named_descendant_for_position() { #[wasm_bindgen_test] async fn named_descendant_for_position_range() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let start_position = Default::default(); let end_position = Default::default(); @@ -512,7 +512,7 @@ async fn named_descendant_for_position_range() { #[wasm_bindgen_test] async fn walk() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let node = crate::util::syntax_node::make().await?.unwrap(); let _cursor = node.walk(); Ok(()) diff --git a/crates/web-tree-sitter-sg/tests/node/tree.rs b/crates/web-tree-sitter-sg/tests/node/tree.rs index de3339c..51aac5e 100644 --- a/crates/web-tree-sitter-sg/tests/node/tree.rs +++ b/crates/web-tree-sitter-sg/tests/node/tree.rs @@ -5,7 +5,7 @@ use web_tree_sitter_sg::*; #[wasm_bindgen_test] async fn copy() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let tree = crate::util::tree::make().await?.unwrap(); let _tree = tree.copy(); Ok(()) @@ -16,7 +16,7 @@ async fn copy() { #[wasm_bindgen_test] async fn delete() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let tree = crate::util::tree::make().await?.unwrap(); tree.delete(); Ok(()) @@ -27,7 +27,7 @@ async fn delete() { #[wasm_bindgen_test] async fn edit() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let tree = crate::util::tree::make().await?.unwrap(); let edit = Default::default(); let _tree = tree.edit(&edit); @@ -39,7 +39,7 @@ async fn edit() { #[wasm_bindgen_test] async fn walk() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let tree = crate::util::tree::make().await?.unwrap(); let _cursor = tree.walk(); Ok(()) @@ -50,7 +50,7 @@ async fn walk() { #[wasm_bindgen_test] async fn get_changed_ranges() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let this = crate::util::tree::make().await?.unwrap(); let that = this.copy(); let _changed = this.get_changed_ranges(&that); @@ -62,7 +62,7 @@ async fn get_changed_ranges() { #[wasm_bindgen_test] async fn get_language() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let tree = crate::util::tree::make().await?.unwrap(); let _language = tree.language(); Ok(()) diff --git a/crates/web-tree-sitter-sg/tests/node/tree_cursor.rs b/crates/web-tree-sitter-sg/tests/node/tree_cursor.rs index 70d1449..42deb6e 100644 --- a/crates/web-tree-sitter-sg/tests/node/tree_cursor.rs +++ b/crates/web-tree-sitter-sg/tests/node/tree_cursor.rs @@ -5,7 +5,7 @@ use web_tree_sitter_sg::*; #[wasm_bindgen_test] async fn node_type() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.node_type(); Ok(()) @@ -16,7 +16,7 @@ async fn node_type() { #[wasm_bindgen_test] async fn node_text() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.node_text(); Ok(()) @@ -27,7 +27,7 @@ async fn node_text() { #[wasm_bindgen_test] async fn node_is_named() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.node_is_named(); Ok(()) @@ -38,7 +38,7 @@ async fn node_is_named() { #[wasm_bindgen_test] async fn start_position() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.start_position(); Ok(()) @@ -49,7 +49,7 @@ async fn start_position() { #[wasm_bindgen_test] async fn end_position() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.end_position(); Ok(()) @@ -60,7 +60,7 @@ async fn end_position() { #[wasm_bindgen_test] async fn start_index() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.start_index(); Ok(()) @@ -71,7 +71,7 @@ async fn start_index() { #[wasm_bindgen_test] async fn end_index() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.end_index(); Ok(()) @@ -82,7 +82,7 @@ async fn end_index() { #[wasm_bindgen_test] async fn reset() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); let node = cursor.current_node(); cursor.reset(&node); @@ -94,7 +94,7 @@ async fn reset() { #[wasm_bindgen_test] async fn delete() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.delete(); Ok(()) @@ -105,7 +105,7 @@ async fn delete() { #[wasm_bindgen_test] async fn current_node() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.current_node(); Ok(()) @@ -116,7 +116,7 @@ async fn current_node() { #[wasm_bindgen_test] async fn current_field_id() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.current_field_id(); Ok(()) @@ -127,7 +127,7 @@ async fn current_field_id() { #[wasm_bindgen_test] async fn current_field_name() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.current_field_name(); Ok(()) @@ -138,7 +138,7 @@ async fn current_field_name() { #[wasm_bindgen_test] async fn goto_parent() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.goto_parent(); Ok(()) @@ -149,7 +149,7 @@ async fn goto_parent() { #[wasm_bindgen_test] async fn goto_first_child() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.goto_first_child(); Ok(()) @@ -160,7 +160,7 @@ async fn goto_first_child() { #[wasm_bindgen_test] async fn goto_next_sibling() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.goto_next_sibling(); Ok(()) @@ -171,7 +171,7 @@ async fn goto_next_sibling() { #[wasm_bindgen_test] async fn goto_previous_sibling() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.goto_previous_sibling(); Ok(()) @@ -182,7 +182,7 @@ async fn goto_previous_sibling() { #[wasm_bindgen_test] async fn goto_first_child_for_index() { async fn inner() -> Result<(), JsValue> { - TreeSitter::init().await?; + TreeSitter::init(None).await?; let cursor = crate::util::tree::cursor().await?.unwrap(); cursor.goto_first_child_for_index(0); Ok(())