Unvendor tree-sitter-newick

For #891.

Author: wetneb

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ### Parsing
 
-Added support for protocol buffer files. Updated CMake, Solidity, HCL, Dart, Elm, Devicetree, Gleam and R parsers.
+Added support for protocol buffer files. Updated CMake, Solidity, HCL, Dart, Elm, Devicetree, Gleam, Newick and R parsers.
 
 ### Display
 

Cargo.lock

@@ -100,6 +100,7 @@ tree-sitter-json = "0.24.8"
 tree-sitter-julia = "0.23.1"
 tree-sitter-lua = "0.2.0"
 tree-sitter-make = "1.1.1"
+tree-sitter-newick = "1.1.0"
 tree-sitter-nix = "0.0.2"
 tree-sitter-objc = "3.0.2"
 tree-sitter-ocaml = "0.23.2"

Cargo.toml

@@ -117,11 +117,6 @@ fn main() {
             src_dir: "vendored_parsers/tree-sitter-latex-src",
             extra_files: vec!["scanner.c"],
         },
-        TreeSitterParser {
-            name: "tree-sitter-newick",
-            src_dir: "vendored_parsers/tree-sitter-newick-src",
-            extra_files: vec![],
-        },
         TreeSitterParser {
             name: "tree-sitter-perl",
             src_dir: "vendored_parsers/tree-sitter-perl-src",

build.rs

@@ -80,7 +80,6 @@ extern "C" {
     fn tree_sitter_janet_simple() -> ts::Language;
     fn tree_sitter_kotlin() -> ts::Language;
     fn tree_sitter_latex() -> ts::Language;
-    fn tree_sitter_newick() -> ts::Language;
     fn tree_sitter_perl() -> ts::Language;
     fn tree_sitter_qmljs() -> ts::Language;
     fn tree_sitter_racket() -> ts::Language;
@@ -707,7 +706,10 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         Newick => {
-            let language = unsafe { tree_sitter_newick() };
+            // The bindings are still using the old format, but the parser is generated for TS 0.25
+            let language_fn = tree_sitter_newick::LANGUAGE;
+            let language = tree_sitter::Language::new(language_fn);
+
             TreeSitterConfig {
                 language: language.clone(),
                 atom_nodes: [].into_iter().collect(),

src/parse/tree_sitter_parser.rs

@@ -0,0 +1,8 @@
+"(" @punctuation.bracket
+")" @punctuation.bracket
+"[&&NHX" @punctuation.bracket
+"]" @punctuation.bracket
+
+(name) @function
+(length) @number
+(nhx_entry key: (nhx_val) @keyword value: (nhx_val) @string.special)