Use tree-sitter-toml from crates.io

Author: Wilfred

CHANGELOG.md

@@ -12,7 +12,7 @@ Improved language detection when one argument is a named pipe.
 
 Updated to the latest tree-sitter parser for Bash, C, C++, C#, CSS,
 Go, Haskell, HTML, Java, JavaScript, JSON, Julia, Objective-C, OCaml,
-PHP, Python, Ruby, Scala and TypeScript.
+PHP, Python, Ruby, Scala, TOML and TypeScript.
 
 ### Syntax Highlighting
 

Cargo.lock

@@ -97,6 +97,7 @@ tree-sitter-php = "0.23.11"
 tree-sitter-json = "0.24.8"
 tree-sitter-html = "0.23.2"
 tree-sitter-css = "0.23.1"
+tree-sitter-toml-ng = "0.7.0"
 
 [dev-dependencies]
 # assert_cmd 2.0.10 requires predicates 3.

Cargo.toml

@@ -247,11 +247,6 @@ fn main() {
             src_dir: "vendored_parsers/tree-sitter-swift-src",
             extra_files: vec!["scanner.c"],
         },
-        TreeSitterParser {
-            name: "tree-sitter-toml",
-            src_dir: "vendored_parsers/tree-sitter-toml-src",
-            extra_files: vec!["scanner.c"],
-        },
         TreeSitterParser {
             name: "tree-sitter-vhdl",
             src_dir: "vendored_parsers/tree-sitter-vhdl-src",

build.rs

@@ -60,16 +60,16 @@ with `difft --list-languages`.
 
 ## Structured Text Formats
 
-| Language | Parser Used                                                                         |
-|----------|-------------------------------------------------------------------------------------|
-| CSS      | [tree-sitter/tree-sitter-css](https://github.com/tree-sitter/tree-sitter-css)       |
-| HCL      | [MichaHoffmann/tree-sitter-hcl](https://github.com/MichaHoffmann/tree-sitter-hcl)   |
-| HTML     | [tree-sitter/tree-sitter-html](https://github.com/tree-sitter/tree-sitter-html)     |
-| JSON     | [tree-sitter/tree-sitter-json](https://github.com/tree-sitter/tree-sitter-json)     |
-| LaTeX    | [latex-lsp/tree-sitter-latex](https://github.com/latex-lsp/tree-sitter-latex)       |
-| Newick   | [delehef/tree-sitter-newick](https://github.com/delehef/tree-sitter-newick)         |
-| SCSS     | [serenadeai/tree-sitter-scss](https://github.com/serenadeai/tree-sitter-scss)       |
-| TOML     | [ikatyang/tree-sitter-toml](https://github.com/ikatyang/tree-sitter-toml)           |
-| XML      | [ObserverOfTime/tree-sitter-xml](https://github.com/ObserverOfTime/tree-sitter-xml) |
-| YAML     | [ikatyang/tree-sitter-yaml](https://github.com/ikatyang/tree-sitter-yaml)           |
+| Language | Parser Used                                                                                       |
+|----------|---------------------------------------------------------------------------------------------------|
+| CSS      | [tree-sitter/tree-sitter-css](https://github.com/tree-sitter/tree-sitter-css)                     |
+| HCL      | [MichaHoffmann/tree-sitter-hcl](https://github.com/MichaHoffmann/tree-sitter-hcl)                 |
+| HTML     | [tree-sitter/tree-sitter-html](https://github.com/tree-sitter/tree-sitter-html)                   |
+| JSON     | [tree-sitter/tree-sitter-json](https://github.com/tree-sitter/tree-sitter-json)                   |
+| LaTeX    | [latex-lsp/tree-sitter-latex](https://github.com/latex-lsp/tree-sitter-latex)                     |
+| Newick   | [delehef/tree-sitter-newick](https://github.com/delehef/tree-sitter-newick)                       |
+| SCSS     | [serenadeai/tree-sitter-scss](https://github.com/serenadeai/tree-sitter-scss)                     |
+| TOML     | [tree-sitter-grammars/tree-sitter-toml](https://github.com/tree-sitter-grammars/tree-sitter-toml) |
+| XML      | [ObserverOfTime/tree-sitter-xml](https://github.com/ObserverOfTime/tree-sitter-xml)               |
+| YAML     | [ikatyang/tree-sitter-yaml](https://github.com/ikatyang/tree-sitter-yaml)                         |
 

manual/src/languages_supported.md

@@ -278,7 +278,7 @@ sample_files/todomvc_1.gleam sample_files/todomvc_2.gleam
 9fe64f7d77ad99095ac29357554f3d71  -
 
 sample_files/toml_1.toml sample_files/toml_2.toml
-a771827287e174fc2e18a1cd2624bc9c  -
+c331bdb54c00b0a5b5a622dbd250042a  -
 
 sample_files/trailling_newline_1.yaml sample_files/trailling_newline_2.yaml
 8e37febfec957288576f9c2020cfc4f2  -

sample_files/compare.expected

@@ -97,7 +97,6 @@ extern "C" {
     fn tree_sitter_solidity() -> ts::Language;
     fn tree_sitter_sql() -> ts::Language;
     fn tree_sitter_swift() -> ts::Language;
-    fn tree_sitter_toml() -> ts::Language;
     fn tree_sitter_vhdl() -> ts::Language;
     fn tree_sitter_xml() -> ts::Language;
     fn tree_sitter_yaml() -> ts::Language;
@@ -1038,16 +1037,15 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         Toml => {
-            let language = unsafe { tree_sitter_toml() };
+            let language_fn = tree_sitter_toml_ng::LANGUAGE;
+            let language = tree_sitter::Language::new(language_fn);
+
             TreeSitterConfig {
                 language: language.clone(),
                 atom_nodes: vec!["string", "quoted_key"].into_iter().collect(),
                 delimiter_tokens: vec![("{", "}"), ("[", "]")],
-                highlight_query: ts::Query::new(
-                    &language,
-                    include_str!("../../vendored_parsers/highlights/toml.scm"),
-                )
-                .unwrap(),
+                highlight_query: ts::Query::new(&language, tree_sitter_toml_ng::HIGHLIGHTS_QUERY)
+                    .unwrap(),
                 sub_languages: vec![],
             }
         }