zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-07 20:39:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade tree-sitter to 0.20.1

Browse Source
This commit is contained in:
Max Brunsfeld 2021-12-05 21:37:08 -08:00
parent a13e2518b8
commit 026c3476db
8 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Cargo.lock generated
View File

@ -5135,8 +5135,9 @@ dependencies = [
[[package]]
name = "tree-sitter"
version = "0.19.5"
source = "git+https://github.com/tree-sitter/tree-sitter?rev=d72771a19f4143530b1cfd23808e344f1276e176#d72771a19f4143530b1cfd23808e344f1276e176"
version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9394e9dbfe967b5f3d6ab79e302e78b5fb7b530c368d634ff3b8d67ede138bf1"
dependencies = [
"cc",
"regex",
@ -5144,9 +5145,9 @@ dependencies = [
[[package]]
name = "tree-sitter-rust"
version = "0.19.0"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "784f7ef9cdbd4c895dc2d4bb785e95b4a5364a602eec803681db83d1927ddf15"
checksum = "3df540a493d754015d22eaf57c38f58804be3713a22f6062db983ec15f85c3c9"
dependencies = [
"cc",
"tree-sitter",
@ -5643,8 +5644,6 @@ dependencies = [
"project",
"serde_json",
"theme",
"tree-sitter",
"tree-sitter-rust",
]
[[package]]

1
Cargo.toml
View File

@ -4,7 +4,6 @@ default-members = ["crates/zed"]
[patch.crates-io]
async-task = { git = "https://github.com/zed-industries/async-task", rev = "341b57d6de98cdfd7b418567b8de2022ca993a6e" }
tree-sitter = { git = "https://github.com/tree-sitter/tree-sitter", rev = "d72771a19f4143530b1cfd23808e344f1276e176" }
# TODO - Remove when a version is released with this PR: https://github.com/servo/core-foundation-rs/pull/457
cocoa = { git = "https://github.com/servo/core-foundation-rs", rev = "025dcb3c0d1ef01530f57ef65f3b1deb948f5737" }
cocoa-foundation = { git = "https://github.com/servo/core-foundation-rs", rev = "025dcb3c0d1ef01530f57ef65f3b1deb948f5737" }

4
crates/editor/Cargo.toml
View File

@ -41,5 +41,5 @@ ctor = "0.1"
env_logger = "0.8"
rand = "0.8"
unindent = "0.1.7"
tree-sitter = "0.19"
tree-sitter-rust = "0.19"
tree-sitter = "0.20"
tree-sitter-rust = "0.20"

2
crates/gpui/Cargo.toml
View File

@ -38,7 +38,7 @@ smallvec = { version = "1.6", features = ["union"] }
smol = "1.2"
time = { version = "0.3" }
tiny-skia = "0.5"
tree-sitter = "0.19"
tree-sitter = "0.20"
usvg = "0.14"
waker-fn = "1.1.0"

2
crates/gpui/grammars/context-predicate/Cargo.toml
View File

@ -14,7 +14,7 @@ include = ["bindings/rust/*", "grammar.js", "queries/*", "src/*"]
path = "bindings/rust/lib.rs"
[dependencies]
tree-sitter = "0.19.3"
tree-sitter = "0.20"
[build-dependencies]
cc = "1.0"

6
crates/language/Cargo.toml
View File

@ -32,13 +32,13 @@ rand = { version = "0.8.3", optional = true }
serde = { version = "1", features = ["derive"] }
similar = "1.3"
smol = "1.2"
tree-sitter = "0.19.5"
tree-sitter-rust = { version = "0.19.0", optional = true }
tree-sitter = "0.20.0"
tree-sitter-rust = { version = "0.20.0", optional = true }
[dev-dependencies]
text = { path = "../text", features = ["test-support"] }
gpui = { path = "../gpui", features = ["test-support"] }
lsp = { path = "../lsp", features = ["test-support"] }
rand = "0.8.3"
tree-sitter-rust = "0.19.0"
tree-sitter-rust = "0.20.0"
unindent = "0.1.7"

11
crates/workspace/Cargo.toml
View File

@ -7,12 +7,7 @@ edition = "2018"
path = "src/workspace.rs"
[features]
test-support = [
"client/test-support",
"project/test-support",
"tree-sitter",
"tree-sitter-rust",
]
test-support = ["client/test-support", "project/test-support"]
[dependencies]
client = { path = "../client" }
@ -23,13 +18,9 @@ theme = { path = "../theme" }
anyhow = "1.0.38"
log = "0.4"
postage = { version = "0.4.1", features = ["futures-traits"] }
tree-sitter = { version = "0.19.5", optional = true }
tree-sitter-rust = { version = "0.19.0", optional = true }
[dev-dependencies]
client = { path = "../client", features = ["test-support"] }
gpui = { path = "../gpui", features = ["test-support"] }
project = { path = "../project", features = ["test-support"] }
serde_json = { version = "1.0.64", features = ["preserve_order"] }
tree-sitter = "0.19.5"
tree-sitter-rust = "0.19.0"

4
crates/zed/Cargo.toml
View File

@ -84,8 +84,8 @@ thiserror = "1.0.29"
time = "0.3"
tiny_http = "0.8"
toml = "0.5"
tree-sitter = "0.19.5"
tree-sitter-rust = "0.19.0"
tree-sitter = "0.20.0"
tree-sitter-rust = "0.20.0"
url = "2.2"
[dev-dependencies]