Unvendor tree-sitter-racket

Author: wetneb

CHANGELOG.md

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

Cargo.lock

@@ -109,6 +109,7 @@ tree-sitter-php = "0.23.11"
 tree-sitter-proto = "0.2.0"
 tree-sitter-python = "0.23.5"
 tree-sitter-r = "1.2.0"
+tree-sitter-racket = "0.24.7"
 tree-sitter-ruby = "0.23.1"
 tree-sitter-rust-orchard = "0.13.0"
 tree-sitter-scala = "0.23.3"

Cargo.toml

@@ -127,11 +127,6 @@ fn main() {
             src_dir: "vendored_parsers/tree-sitter-qmljs-src",
             extra_files: vec!["scanner.c"],
         },
-        TreeSitterParser {
-            name: "tree-sitter-racket",
-            src_dir: "vendored_parsers/tree-sitter-racket-src",
-            extra_files: vec!["scanner.c"],
-        },
         TreeSitterParser {
             name: "tree-sitter-scheme",
             src_dir: "vendored_parsers/tree-sitter-scheme-src",

build.rs

@@ -218,7 +218,7 @@ sample_files/r_1.R sample_files/r_2.R
 f9ee6c271d614bfcd510633bddc9e49d  -
 
 sample_files/racket_1.rkt sample_files/racket_2.rkt
-b017e169d9fc79336fd7ef82140fe8a7  -
+ba1164af47f67d0865a4ba7706096bbc  -
 
 sample_files/repeated_line_no_eol_1.txt sample_files/repeated_line_no_eol_2.txt
 b63c743f2133480de3ba42ecdec5eb93  -

sample_files/compare.expected

@@ -81,7 +81,6 @@ extern "C" {
     fn tree_sitter_latex() -> ts::Language;
     fn tree_sitter_perl() -> ts::Language;
     fn tree_sitter_qmljs() -> ts::Language;
-    fn tree_sitter_racket() -> ts::Language;
     fn tree_sitter_scheme() -> ts::Language;
     fn tree_sitter_smali() -> ts::Language;
     fn tree_sitter_scss() -> ts::Language;
@@ -889,18 +888,16 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         Racket => {
-            let language = unsafe { tree_sitter_racket() };
+            let language_fn = tree_sitter_racket::LANGUAGE;
+            let language = tree_sitter::Language::new(language_fn);
             TreeSitterConfig {
                 language: language.clone(),
                 atom_nodes: ["string", "byte_string", "regex", "here_string"]
                     .into_iter()
                     .collect(),
                 delimiter_tokens: vec![("{", "}"), ("(", ")"), ("[", "]")],
-                highlight_query: ts::Query::new(
-                    &language,
-                    include_str!("../../vendored_parsers/highlights/racket.scm"),
-                )
-                .unwrap(),
+                highlight_query: ts::Query::new(&language, tree_sitter_racket::HIGHLIGHTS_QUERY)
+                    .unwrap(),
                 sub_languages: vec![],
             }
         }