on master help sign in
Revert "Pin tree-sitter to the 0.20.10 release (#8396)"

We only reverted so that the latest release would use a stable tree-sitter version hosted on crates.io. We do want the improvements on nightly. This reverts commit 2ebcc4dbeb306cc285d47bd1d21d72c7e57ecb72.

commit5ce1c30f775ba74b2b061655aea4441d8beaa445 authorBlaž Hrastnik <blaz@mxxn.io> dateThu 26 Oct 2023, 15:58 (3 years ago) parentc24a67c
3 files changed+4−5
Cargo.lock+1−2 Cargo.toml+1−1 helix-core/src/syntax.rs+2−2
Cargo.lock+1−2
@@ -2260,8 +2260,7 @@ dependencies = [
22602260[[package]]
22612261name = "tree-sitter"
22622262version = "0.20.10"
2263−source = "registry+https://github.com/rust-lang/crates.io-index"
2264−checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
2263+source = "git+https://github.com/tree-sitter/tree-sitter?rev=ab09ae20d640711174b8da8a654f6b3dec93da1a#ab09ae20d640711174b8da8a654f6b3dec93da1a"
22652264dependencies = [
22662265 "cc",
22672266 "regex",
Cargo.toml+1−1
@@ -35,5 +35,5 @@ package.helix-tui.opt-level = 2
3535package.helix-term.opt-level = 2
3636
3737[workspace.dependencies]
38−tree-sitter = { version = "0.20" }
38+tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
3939nucleo = "0.2.0"
helix-core/src/syntax.rs+2−2
@@ -1614,7 +1614,7 @@ impl<'a> Iterator for ChunksBytes<'a> {
16141614}
16151615
16161616pub struct RopeProvider<'a>(pub RopeSlice<'a>);
1617−impl<'a> TextProvider<'a> for RopeProvider<'a> {
1617+impl<'a> TextProvider<&'a [u8]> for RopeProvider<'a> {
16181618 type I = ChunksBytes<'a>;
16191619
16201620 fn text(&mut self, node: Node) -> Self::I {
@@ -1628,7 +1628,7 @@ impl<'a> TextProvider<'a> for RopeProvider<'a> {
16281628struct HighlightIterLayer<'a> {
16291629 _tree: Option<Tree>,
16301630 cursor: QueryCursor,
1631− captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>>>>,
1631+ captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>, &'a [u8]>>>,
16321632 config: &'a HighlightConfiguration,
16331633 highlight_end_stack: Vec<usize>,
16341634 scope_stack: Vec<LocalScope<'a>>,