From 262a595e5343c5afd0f2570859b63ebf4c12b0fa Mon Sep 17 00:00:00 2001 From: Pascal Kuthe Date: Thu, 27 Jul 2023 04:50:40 +0200 Subject: [PATCH] pin TS to unreleased git revision to fix freezes (#7737) --- Cargo.lock | 3 +-- Cargo.toml | 3 +++ helix-core/Cargo.toml | 2 +- helix-loader/Cargo.toml | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8c8bce2a1..75bdbc9b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2359,8 +2359,7 @@ dependencies = [ [[package]] name = "tree-sitter" version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" +source = "git+https://github.com/tree-sitter/tree-sitter?rev=7d4b0110a9e92161d247a051018ee42b0513e98d#7d4b0110a9e92161d247a051018ee42b0513e98d" dependencies = [ "cc", "regex", diff --git a/Cargo.toml b/Cargo.toml index c63518897..1d10dd9b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,3 +32,6 @@ inherits = "test" package.helix-core.opt-level = 2 package.helix-tui.opt-level = 2 package.helix-term.opt-level = 2 + +[workspace.dependencies] +tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "7d4b0110a9e92161d247a051018ee42b0513e98d" } diff --git a/helix-core/Cargo.toml b/helix-core/Cargo.toml index 895ee5bcf..f45d97b8e 100644 --- a/helix-core/Cargo.toml +++ b/helix-core/Cargo.toml @@ -25,7 +25,7 @@ unicode-width = "0.1" unicode-general-category = "0.6" # slab = "0.4.2" slotmap = "1.0" -tree-sitter = "0.20" +tree-sitter.workspace = true once_cell = "1.18" arc-swap = "1" regex = "1" diff --git a/helix-loader/Cargo.toml b/helix-loader/Cargo.toml index 80265d30e..55f8422bc 100644 --- a/helix-loader/Cargo.toml +++ b/helix-loader/Cargo.toml @@ -18,7 +18,7 @@ anyhow = "1" serde = { version = "1.0", features = ["derive"] } toml = "0.7" etcetera = "0.8" -tree-sitter = "0.20" +tree-sitter.workspace = true once_cell = "1.18" log = "0.4" which = "4.4"