Use tree-sitter-typescript from crates.io

Wilfred · Dec 20, 2024 · 776d978 · 776d978
1 parent 88731f9
commit 776d978
Show file tree

Hide file tree

Showing 67 changed files with 20 additions and 861,433 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,7 +11,7 @@ with YAML.
 Improved language detection when one argument is a named pipe.
 
 Updated to the latest tree-sitter parser for C, C++, C#, Haskell,
-JavaScript, Objective-C, OCaml, Python, Ruby and Scala.
+JavaScript, Objective-C, OCaml, Python, Ruby, Scala and TypeScript.
 
 ### Syntax Highlighting
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -88,6 +88,7 @@ tree-sitter-python = "0.23.5"
 tree-sitter-cpp = "0.23.4"
 tree-sitter-c = "0.23.4"
 tree-sitter-javascript = "0.23.1"
+tree-sitter-typescript = "0.23.2"
 
 [dev-dependencies]
 # assert_cmd 2.0.10 requires predicates 3.

diff --git a/build.rs b/build.rs
@@ -289,16 +289,6 @@ fn main() {
             src_dir: "vendored_parsers/tree-sitter-toml-src",
             extra_files: vec!["scanner.c"],
         },
-        TreeSitterParser {
-            name: "tree-sitter-tsx",
-            src_dir: "vendored_parsers/tree-sitter-typescript-src/tsx/src",
-            extra_files: vec!["scanner.c"],
-        },
-        TreeSitterParser {
-            name: "tree-sitter-typescript",
-            src_dir: "vendored_parsers/tree-sitter-typescript-src/typescript/src",
-            extra_files: vec!["scanner.c"],
-        },
         TreeSitterParser {
             name: "tree-sitter-vhdl",
             src_dir: "vendored_parsers/tree-sitter-vhdl-src",

diff --git a/src/parse/tree_sitter_parser.rs b/src/parse/tree_sitter_parser.rs
@@ -106,8 +106,6 @@ extern "C" {
     fn tree_sitter_sql() -> ts::Language;
     fn tree_sitter_swift() -> ts::Language;
     fn tree_sitter_toml() -> ts::Language;
-    fn tree_sitter_tsx() -> ts::Language;
-    fn tree_sitter_typescript() -> ts::Language;
     fn tree_sitter_vhdl() -> ts::Language;
     fn tree_sitter_xml() -> ts::Language;
     fn tree_sitter_yaml() -> ts::Language;
@@ -874,9 +872,7 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             let language = unsafe { tree_sitter_qmljs() };
 
             let mut highlight_query = tree_sitter_javascript::HIGHLIGHT_QUERY.to_owned();
-            highlight_query.push_str(include_str!(
-                "../../vendored_parsers/highlights/typescript.scm"
-            ));
+            highlight_query.push_str(tree_sitter_typescript::HIGHLIGHTS_QUERY);
             highlight_query.push_str(include_str!("../../vendored_parsers/highlights/qmljs.scm"));
 
             TreeSitterConfig {
@@ -1070,12 +1066,11 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         TypeScriptTsx => {
-            let language = unsafe { tree_sitter_tsx() };
+            let language_fn = tree_sitter_typescript::LANGUAGE_TSX;
+            let language = tree_sitter::Language::new(language_fn);
 
             let mut highlight_query = tree_sitter_javascript::HIGHLIGHT_QUERY.to_owned();
-            highlight_query.push_str(include_str!(
-                "../../vendored_parsers/highlights/typescript.scm"
-            ));
+            highlight_query.push_str(tree_sitter_typescript::HIGHLIGHTS_QUERY);
 
             TreeSitterConfig {
                 language: language.clone(),
@@ -1086,12 +1081,11 @@ pub(crate) fn from_language(language: guess::Language) -> TreeSitterConfig {
             }
         }
         TypeScript => {
-            let language = unsafe { tree_sitter_typescript() };
+            let language_fn = tree_sitter_typescript::LANGUAGE_TYPESCRIPT;
+            let language = tree_sitter::Language::new(language_fn);
 
             let mut highlight_query = tree_sitter_javascript::HIGHLIGHT_QUERY.to_owned();
-            highlight_query.push_str(include_str!(
-                "../../vendored_parsers/highlights/typescript.scm"
-            ));
+            highlight_query.push_str(tree_sitter_typescript::HIGHLIGHTS_QUERY);
 
             TreeSitterConfig {
                 language: language.clone(),

diff --git a/vendored_parsers/highlights/typescript.scm b/vendored_parsers/highlights/typescript.scm
diff --git a/vendored_parsers/tree-sitter-typescript-src/common b/vendored_parsers/tree-sitter-typescript-src/common
diff --git a/vendored_parsers/tree-sitter-typescript-src/tsx b/vendored_parsers/tree-sitter-typescript-src/tsx
diff --git a/vendored_parsers/tree-sitter-typescript-src/typescript b/vendored_parsers/tree-sitter-typescript-src/typescript
diff --git a/vendored_parsers/tree-sitter-typescript/.eslintrc.js b/vendored_parsers/tree-sitter-typescript/.eslintrc.js
diff --git a/vendored_parsers/tree-sitter-typescript/.gitattributes b/vendored_parsers/tree-sitter-typescript/.gitattributes
diff --git a/vendored_parsers/tree-sitter-typescript/.github/ISSUE_TEMPLATE/bug_report.yml b/vendored_parsers/tree-sitter-typescript/.github/ISSUE_TEMPLATE/bug_report.yml
diff --git a/vendored_parsers/tree-sitter-typescript/.github/ISSUE_TEMPLATE/config.yml b/vendored_parsers/tree-sitter-typescript/.github/ISSUE_TEMPLATE/config.yml
diff --git a/vendored_parsers/tree-sitter-typescript/.github/ISSUE_TEMPLATE/feature_request.yml b/vendored_parsers/tree-sitter-typescript/.github/ISSUE_TEMPLATE/feature_request.yml
diff --git a/vendored_parsers/tree-sitter-typescript/.github/pull_request_template.md b/vendored_parsers/tree-sitter-typescript/.github/pull_request_template.md
diff --git a/vendored_parsers/tree-sitter-typescript/.github/workflows/ci.yml b/vendored_parsers/tree-sitter-typescript/.github/workflows/ci.yml
diff --git a/vendored_parsers/tree-sitter-typescript/.github/workflows/lint.yml b/vendored_parsers/tree-sitter-typescript/.github/workflows/lint.yml