From 026c3476dbe2546e6940ee5bff32d9606e53fe4b Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Sun, 5 Dec 2021 21:37:08 -0800 Subject: [PATCH] Upgrade tree-sitter to 0.20.1 --- Cargo.lock | 11 +++++------ Cargo.toml | 1 - crates/editor/Cargo.toml | 4 ++-- crates/gpui/Cargo.toml | 2 +- crates/gpui/grammars/context-predicate/Cargo.toml | 2 +- crates/language/Cargo.toml | 6 +++--- crates/workspace/Cargo.toml | 11 +---------- crates/zed/Cargo.toml | 4 ++-- 8 files changed, 15 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f622754379..5d17718982 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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]] diff --git a/Cargo.toml b/Cargo.toml index 98c5bf46d6..f945561e7c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" } diff --git a/crates/editor/Cargo.toml b/crates/editor/Cargo.toml index ed0d1b7413..aa000c98c9 100644 --- a/crates/editor/Cargo.toml +++ b/crates/editor/Cargo.toml @@ -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" diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml index 7c237d48e5..4414936c9e 100644 --- a/crates/gpui/Cargo.toml +++ b/crates/gpui/Cargo.toml @@ -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" diff --git a/crates/gpui/grammars/context-predicate/Cargo.toml b/crates/gpui/grammars/context-predicate/Cargo.toml index 9e3316c0f2..1dea1930fa 100644 --- a/crates/gpui/grammars/context-predicate/Cargo.toml +++ b/crates/gpui/grammars/context-predicate/Cargo.toml @@ -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" diff --git a/crates/language/Cargo.toml b/crates/language/Cargo.toml index ad0f84b4dc..f4037ee70a 100644 --- a/crates/language/Cargo.toml +++ b/crates/language/Cargo.toml @@ -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" diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml index 29e25148e5..a5ca3c91e9 100644 --- a/crates/workspace/Cargo.toml +++ b/crates/workspace/Cargo.toml @@ -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" diff --git a/crates/zed/Cargo.toml b/crates/zed/Cargo.toml index 9657691fc9..3c894f8894 100644 --- a/crates/zed/Cargo.toml +++ b/crates/zed/Cargo.toml @@ -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]