Merge pull request #16481 from hvitved/treesitter/bump2

Tree-sitter: Bump to 0.22.6

shared/tree-sitter-extractor/Cargo.toml

@@ -7,7 +7,7 @@ authors = ["GitHub"]
 [dependencies]
 flate2 = "1.0"
 globset = "0.4"
-tree-sitter = "0.20"
+tree-sitter = ">= 0.22.6"
 tracing = "0.1"
 rayon = "1.5.0"
 regex = "1.7.1"
@@ -20,5 +20,8 @@ num_cpus = "1.14.0"
 
 [dev-dependencies]
 tree-sitter-ql = { git = "https://github.com/tree-sitter/tree-sitter-ql" }
-tree-sitter-json = {git = "https://github.com/tausbn/tree-sitter-json" }
+tree-sitter-json = {git = "https://github.com/tree-sitter/tree-sitter-json" }
 rand = "0.8.5"
+
+[patch.crates-io]
+tree-sitter = {git = "https://github.com/redsun82/tree-sitter.git", rev = "1f5c1112ceaa8fc6aff61d1852690407670d2a96"}

shared/tree-sitter-extractor/rust-toolchain.toml

@@ -2,6 +2,6 @@
 # extractor. It is set to the lowest version of Rust we want to support.
 
 [toolchain]
-channel = "1.68"
+channel = "1.70"
 profile = "minimal"
 components = [ "clippy", "rustfmt" ]

shared/tree-sitter-extractor/src/extractor/mod.rs

@@ -150,7 +150,7 @@ fn location_label(
 
 /// Extracts the source file at `path`, which is assumed to be canonicalized.
 pub fn extract(
-    language: Language,
+    language: &Language,
     language_prefix: &str,
     schema: &NodeTypeMap,
     diagnostics_writer: &mut diagnostics::LogWriter,

shared/tree-sitter-extractor/src/extractor/simple.rs

@@ -137,7 +137,7 @@ impl Extractor {
                                 let lang = &self.languages[i];
 
                                 crate::extractor::extract(
-                                    lang.ts_language,
+                                    &lang.ts_language,
                                     lang.prefix,
                                     &schemas[i],
                                     &mut diagnostics_writer,