on master help sign in
Pin tree-sitter to the 0.20.10 release (#8396)
2ebcc4dMichael Davis
Cargo.lock+2−1
@@ -2260,7 +2260,8 @@ dependencies = [
2260[[package]]
2260[[package]]
2261name = "tree-sitter"
2261name = "tree-sitter"
2262version = "0.20.10"
2262version = "0.20.10"
2263−source = "git+https://github.com/tree-sitter/tree-sitter?rev=ab09ae20d640711174b8da8a654f6b3dec93da1a#ab09ae20d640711174b8da8a654f6b3dec93da1a"
2263+source = "registry+https://github.com/rust-lang/crates.io-index"
2264+checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d"
2264dependencies = [
2265dependencies = [
2265 "cc",
2266 "cc",
2266 "regex",
2267 "regex",
Cargo.toml+1−1
@@ -35,5 +35,5 @@ package.helix-tui.opt-level = 2
35package.helix-term.opt-level = 2
35package.helix-term.opt-level = 2
36
36
37[workspace.dependencies]
37[workspace.dependencies]
38−tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }
38+tree-sitter = { version = "0.20" }
39nucleo = "0.2.0"
39nucleo = "0.2.0"
helix-core/src/syntax.rs+2−2
@@ -1614,7 +1614,7 @@ impl<'a> Iterator for ChunksBytes<'a> {
1614}
1614}
1615
1615
1616pub struct RopeProvider<'a>(pub RopeSlice<'a>);
1616pub struct RopeProvider<'a>(pub RopeSlice<'a>);
1617−impl<'a> TextProvider<&'a [u8]> for RopeProvider<'a> {
1617+impl<'a> TextProvider<'a> for RopeProvider<'a> {
1618 type I = ChunksBytes<'a>;
1618 type I = ChunksBytes<'a>;
1619
1619
1620 fn text(&mut self, node: Node) -> Self::I {
1620 fn text(&mut self, node: Node) -> Self::I {
@@ -1628,7 +1628,7 @@ impl<'a> TextProvider<&'a [u8]> for RopeProvider<'a> {
1628struct HighlightIterLayer<'a> {
1628struct HighlightIterLayer<'a> {
1629 _tree: Option<Tree>,
1629 _tree: Option<Tree>,
1630 cursor: QueryCursor,
1630 cursor: QueryCursor,
1631− captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>, &'a [u8]>>>,
1631+ captures: RefCell<iter::Peekable<QueryCaptures<'a, 'a, RopeProvider<'a>>>>,
1632 config: &'a HighlightConfiguration,
1632 config: &'a HighlightConfiguration,
1633 highlight_end_stack: Vec<usize>,
1633 highlight_end_stack: Vec<usize>,
1634 scope_stack: Vec<LocalScope<'a>>,
1634 scope_stack: Vec<LocalScope<'a>>,