Bump tree-sitter-r and pin tree-sitter to 0.21.0 (#259)

* Update tree-sitter-r in `Cargo.lock`

For r-lib/tree-sitter-r#73

* Bump tree-sitter-r dependency

* Back to `next`

Author: DavisVaughan

Cargo.lock

@@ -48,7 +48,7 @@ serde_json = { version = "1.0.94", features = ["preserve_order"]}
 stdext = { path = "../stdext" }
 tokio = { version = "1.26.0", features = ["full"] }
 tower-lsp = "0.19.0"
-tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter" }
+tree-sitter = "0.21.0"
 tree-sitter-r = { git = "https://github.com/r-lib/tree-sitter-r", branch = "next" }
 uuid = "1.3.0"
 url = "2.4.1"

crates/ark/Cargo.toml

@@ -72,10 +72,13 @@ impl Document {
         // create initial document from rope
         let document = Rope::from(contents);
 
+        let language = tree_sitter_r::language();
+
         // create a parser for this document
         let mut parser = Parser::new();
+
         parser
-            .set_language(tree_sitter_r::language())
+            .set_language(&language)
             .expect("failed to create parser");
         let ast = parser.parse(contents, None).unwrap();
 

crates/ark/src/lsp/documents.rs

@@ -663,9 +663,11 @@ fn test_statement_range() {
         let x = x.replace("@", "");
         let x = x.replace(">>", "");
 
+        let language = tree_sitter_r::language();
+
         let mut parser = Parser::new();
         parser
-            .set_language(tree_sitter_r::language())
+            .set_language(&language)
             .expect("Failed to create parser");
 
         let ast = parser.parse(x, None).unwrap();
@@ -1298,9 +1300,10 @@ test_that('stuff', {
 
 
 ";
+    let language = tree_sitter_r::language();
     let mut parser = Parser::new();
     parser
-        .set_language(tree_sitter_r::language())
+        .set_language(&language)
         .expect("Failed to create parser");
     let ast = parser.parse(contents, None).unwrap();
     let root = ast.root_node();
@@ -1315,9 +1318,10 @@ test_that('stuff', {
 
 }
 ";
+    let language = tree_sitter_r::language();
     let mut parser = Parser::new();
     parser
-        .set_language(tree_sitter_r::language())
+        .set_language(&language)
         .expect("Failed to create parser");
     let ast = parser.parse(contents, None).unwrap();
     let root = ast.root_node();