From 22bb7ab9fbe228fdc8d7f6dd355c5194bf5e9d85 Mon Sep 17 00:00:00 2001
From: Luni-4 <luni-4@hotmail.it>
Date: Mon, 29 Mar 2021 17:07:39 +0200
Subject: [PATCH] Delete TypeScript submodule

---
 .gitmodules            |  3 ---
 Cargo.lock             | 11 +++++++++++
 Cargo.toml             |  1 +
 build.rs               |  3 ---
 enums/Cargo.lock       | 11 +++++++++++
 enums/Cargo.toml       |  1 +
 enums/src/macros.rs    |  2 ++
 src/macros.rs          | 10 ++++++++++
 tree-sitter-typescript |  1 -
 9 files changed, 36 insertions(+), 7 deletions(-)
 delete mode 160000 tree-sitter-typescript

diff --git a/.gitmodules b/.gitmodules
index c0bf37542..14317f443 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,6 +7,3 @@
 [submodule "tree-sitter-rust"]
 	path = tree-sitter-rust
 	url = https://github.com/tree-sitter/tree-sitter-rust/
-[submodule "tree-sitter-typescript"]
-	path = tree-sitter-typescript
-	url = https://github.com/tree-sitter/tree-sitter-typescript/
diff --git a/Cargo.lock b/Cargo.lock
index a509b99c1..07edf4dfa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1703,6 +1703,7 @@ dependencies = [
  "tree-sitter-mozcpp",
  "tree-sitter-mozjs",
  "tree-sitter-preproc",
+ "tree-sitter-typescript",
 ]
 
 [[package]]
@@ -2235,6 +2236,16 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-typescript"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3f62d49c6e56bf291c412ee5e178ea14dff40f14a5f01a8847933f56d65bf3b"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "trust-dns-proto"
 version = "0.19.5"
diff --git a/Cargo.toml b/Cargo.toml
index d8d6960c1..0bc7ff2df 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,6 +32,7 @@ termcolor = "^1.1"
 
 tree-sitter = "^0.19"
 tree-sitter-java = "^0.19"
+tree-sitter-typescript = "^0.19"
 tree-sitter-preproc = { path = "./tree-sitter-preproc", version = "^0.19" }
 tree-sitter-ccomment = { path = "./tree-sitter-ccomment", version = "^0.19" }
 tree-sitter-mozcpp = { path = "./tree-sitter-mozcpp", version = "^0.19" }
diff --git a/build.rs b/build.rs
index 1b14cd791..0f2b4f0ab 100644
--- a/build.rs
+++ b/build.rs
@@ -160,13 +160,10 @@ fn main() {
         "tree-sitter-ccomment".to_string(),
         "tree-sitter-mozcpp".to_string(),
         "tree-sitter-mozjs".to_string(),
-        "tree-sitter-typescript".to_string(),
     ];
     let dirs = collect_tree_sitter_dirs(ignore);
     for dir in dirs {
         let language = &dir[TREE_SITTER.len()..];
         build_dir(&dir, &language);
     }
-    build_dir("tree-sitter-typescript/tsx", "tsx");
-    build_dir("tree-sitter-typescript/typescript", "typescript");
 }
diff --git a/enums/Cargo.lock b/enums/Cargo.lock
index 0d32ea042..3b932bfa1 100644
--- a/enums/Cargo.lock
+++ b/enums/Cargo.lock
@@ -168,6 +168,7 @@ dependencies = [
  "tree-sitter-mozcpp",
  "tree-sitter-mozjs",
  "tree-sitter-preproc",
+ "tree-sitter-typescript",
 ]
 
 [[package]]
@@ -539,6 +540,16 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-typescript"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3f62d49c6e56bf291c412ee5e178ea14dff40f14a5f01a8847933f56d65bf3b"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "unicode-width"
 version = "0.1.8"
diff --git a/enums/Cargo.toml b/enums/Cargo.toml
index af989bceb..cb0767fdd 100644
--- a/enums/Cargo.toml
+++ b/enums/Cargo.toml
@@ -18,6 +18,7 @@ libc = "^0.2"
 
 tree-sitter = "^0.19"
 tree-sitter-java = "^0.19"
+tree-sitter-typescript = "^0.19"
 tree-sitter-preproc = { path = "../tree-sitter-preproc", version = "^0.19" }
 tree-sitter-ccomment = { path = "../tree-sitter-ccomment", version = "^0.19" }
 tree-sitter-mozcpp = { path = "../tree-sitter-mozcpp", version = "^0.19" }
diff --git a/enums/src/macros.rs b/enums/src/macros.rs
index 7580313c8..4d32d17ae 100644
--- a/enums/src/macros.rs
+++ b/enums/src/macros.rs
@@ -17,6 +17,8 @@ macro_rules! mk_get_language {
         pub fn get_language(lang: &LANG) -> Language {
               match lang {
                   LANG::Java => tree_sitter_java::language(),
+                  LANG::Typescript => tree_sitter_typescript::language_typescript(),
+                  LANG::Tsx => tree_sitter_typescript::language_tsx(),
                   LANG::Preproc => tree_sitter_preproc::language(),
                   LANG::Ccomment => tree_sitter_ccomment::language(),
                   LANG::Cpp => tree_sitter_mozcpp::language(),
diff --git a/src/macros.rs b/src/macros.rs
index 26472c3ac..afb7db20e 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -37,6 +37,16 @@ macro_rules! get_language {
             tree_sitter_java::language()
         }
     };
+    (tree_sitter_typescript) => {
+        fn get_language() -> Language {
+            tree_sitter_typescript::language_typescript()
+        }
+    };
+    (tree_sitter_tsx) => {
+        fn get_language() -> Language {
+            tree_sitter_typescript::language_tsx()
+        }
+    };
     (tree_sitter_preproc) => {
         fn get_language() -> Language {
             tree_sitter_preproc::language()
diff --git a/tree-sitter-typescript b/tree-sitter-typescript
deleted file mode 160000
index 3e897ea59..000000000
--- a/tree-sitter-typescript
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3e897ea5925f037cfae2e551f8e6b12eec2a201a