Use tree-sitter-css from crates.io

Author: Wilfred

CHANGELOG.md

@@ -10,9 +10,9 @@ with YAML.
 
 Improved language detection when one argument is a named pipe.
 
-Updated to the latest tree-sitter parser for Bash, C, C++, C#, Go,
-Haskell, HTML, Java, JavaScript, JSON, Julia, Objective-C, OCaml, PHP,
-Python, Ruby, Scala and TypeScript.
+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.
 
 ### Syntax Highlighting
 

Cargo.lock

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

Cargo.toml

@@ -87,11 +87,6 @@ fn main() {
             src_dir: "vendored_parsers/tree-sitter-commonlisp-src",
             extra_files: vec![],
         },
-        TreeSitterParser {
-            name: "tree-sitter-css",
-            src_dir: "vendored_parsers/tree-sitter-css-src",
-            extra_files: vec!["scanner.c"],
-        },
         TreeSitterParser {
             name: "tree-sitter-dart",
             src_dir: "vendored_parsers/tree-sitter-dart-src",

build.rs

@@ -66,7 +66,6 @@ extern "C" {
     fn tree_sitter_clojure() -> ts::Language;
     fn tree_sitter_cmake() -> ts::Language;
     fn tree_sitter_commonlisp() -> ts::Language;
-    fn tree_sitter_css() -> ts::Language;
     fn tree_sitter_dart() -> ts::Language;
     fn tree_sitter_devicetree() -> ts::Language;
     fn tree_sitter_elisp() -> ts::Language;
@@ -264,7 +263,9 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         Css => {
-            let language = unsafe { tree_sitter_css() };
+            let language_fn = tree_sitter_css::LANGUAGE;
+            let language = tree_sitter::Language::new(language_fn);
+
             TreeSitterConfig {
                 language: language.clone(),
                 atom_nodes: vec![
@@ -276,11 +277,8 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
                 .into_iter()
                 .collect(),
                 delimiter_tokens: vec![("{", "}"), ("(", ")")],
-                highlight_query: ts::Query::new(
-                    &language,
-                    include_str!("../../vendored_parsers/highlights/css.scm"),
-                )
-                .unwrap(),
+                highlight_query: ts::Query::new(&language, tree_sitter_css::HIGHLIGHTS_QUERY)
+                    .unwrap(),
                 sub_languages: vec![],
             }
         }