Merge pull request #17350 from hvitved/tree-sitter-0.23

Bump `tree-sitter` to `0.23.0`

shared/tree-sitter-extractor/Cargo.toml

@@ -7,7 +7,7 @@ authors = ["GitHub"]
 [dependencies]
 flate2 = "1.0"
 globset = "0.4"
-tree-sitter = ">= 0.22.6"
+tree-sitter = ">= 0.23.0"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.3", features = ["env-filter"] }
 rayon = "1.5.0"
@@ -24,5 +24,3 @@ tree-sitter-ql = { git = "https://github.com/tree-sitter/tree-sitter-ql" }
 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/tests/integration_test.rs

@@ -13,7 +13,7 @@ use common::{create_source_dir, expect_trap_file, SourceArchive};
 fn simple_extractor() {
     let language = simple::LanguageSpec {
         prefix: "ql",
-        ts_language: tree_sitter_ql::language(),
+        ts_language: tree_sitter_ql::LANGUAGE.into(),
         node_types: tree_sitter_ql::NODE_TYPES,
         file_globs: vec!["*.qll".into()],
     };

shared/tree-sitter-extractor/tests/multiple_languages.rs

@@ -12,13 +12,13 @@ use common::{create_source_dir, expect_trap_file, SourceArchive};
 fn multiple_language_extractor() {
     let lang_ql = simple::LanguageSpec {
         prefix: "ql",
-        ts_language: tree_sitter_ql::language(),
+        ts_language: tree_sitter_ql::LANGUAGE.into(),
         node_types: tree_sitter_ql::NODE_TYPES,
         file_globs: vec!["*.qll".into()],
     };
     let lang_json = simple::LanguageSpec {
         prefix: "json",
-        ts_language: tree_sitter_json::language(),
+        ts_language: tree_sitter_json::LANGUAGE.into(),
         node_types: tree_sitter_json::NODE_TYPES,
         file_globs: vec!["*.json".into(), "*Jsonfile".into()],
     };