diff --git a/.gitmodules b/.gitmodules index 382f40cef..2985b64f5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "tree-sitter-python"] - path = tree-sitter-python - url = https://github.com/tree-sitter/tree-sitter-python/ [submodule "tree-sitter-rust"] path = tree-sitter-rust url = https://github.com/tree-sitter/tree-sitter-rust/ diff --git a/Cargo.lock b/Cargo.lock index 9d4e6a11d..6ccf0b001 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1670,6 +1670,7 @@ dependencies = [ "tree-sitter-mozcpp", "tree-sitter-mozjs", "tree-sitter-preproc", + "tree-sitter-python", "tree-sitter-typescript", ] @@ -2212,6 +2213,16 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "tree-sitter-python" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5646bfe71c4eb1c21b714ce0c38334c311eab767095582859e85da6281e9fd6c" +dependencies = [ + "cc", + "tree-sitter", +] + [[package]] name = "tree-sitter-typescript" version = "0.19.0" diff --git a/Cargo.toml b/Cargo.toml index 313f9ed03..be3a34501 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,6 +34,7 @@ tree-sitter = "^0.19" tree-sitter-java = "^0.19" tree-sitter-typescript = "^0.19" tree-sitter-javascript = "^0.19" +tree-sitter-python = "^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/Cargo.lock b/enums/Cargo.lock index 3975eaaff..d9fd90381 100644 --- a/enums/Cargo.lock +++ b/enums/Cargo.lock @@ -169,6 +169,7 @@ dependencies = [ "tree-sitter-mozcpp", "tree-sitter-mozjs", "tree-sitter-preproc", + "tree-sitter-python", "tree-sitter-typescript", ] @@ -537,6 +538,16 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "tree-sitter-python" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5646bfe71c4eb1c21b714ce0c38334c311eab767095582859e85da6281e9fd6c" +dependencies = [ + "cc", + "tree-sitter", +] + [[package]] name = "tree-sitter-typescript" version = "0.19.0" diff --git a/enums/Cargo.toml b/enums/Cargo.toml index d41d9961b..7114dc79d 100644 --- a/enums/Cargo.toml +++ b/enums/Cargo.toml @@ -20,6 +20,7 @@ tree-sitter = "^0.19" tree-sitter-java = "^0.19" tree-sitter-typescript = "^0.19" tree-sitter-javascript = "^0.19" +tree-sitter-python = "^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 e7bc63bac..4c974ce70 100644 --- a/enums/src/macros.rs +++ b/enums/src/macros.rs @@ -20,6 +20,7 @@ macro_rules! mk_get_language { LANG::Typescript => tree_sitter_typescript::language_typescript(), LANG::Tsx => tree_sitter_typescript::language_tsx(), LANG::Javascript => tree_sitter_javascript::language(), + LANG::Python => tree_sitter_python::language(), 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 2d9ec0139..9c4ef982b 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -52,6 +52,11 @@ macro_rules! get_language { tree_sitter_javascript::language() } }; + (tree_sitter_python) => { + fn get_language() -> Language { + tree_sitter_python::language() + } + }; (tree_sitter_preproc) => { fn get_language() -> Language { tree_sitter_preproc::language() diff --git a/tree-sitter-python b/tree-sitter-python deleted file mode 160000 index 79e014734..000000000 --- a/tree-sitter-python +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 79e014734f40fd37644af24b49f368ed6c75a501