01a1e5e · helix · git.iko.soy

Update tree-sitter to latest master (#7998)

commit01a1e5ec2a8c5b81da1360746dad0a96cd88ae8e authorMichael Davis <mcarsondavis@gmail.com> dateSat 19 Aug 2023, 10:21 (3 years ago) parente4c95f6

3 files changed+4−4

unifiedsplit

Cargo.lock+1−1

@@ -2359,7 +2359,7 @@ dependencies = [

23592359[[package]]

23602360name = "tree-sitter"

23612361version = "0.20.10"

2362−source = "git+https://github.com/tree-sitter/tree-sitter?rev=7d4b0110a9e92161d247a051018ee42b0513e98d#7d4b0110a9e92161d247a051018ee42b0513e98d"

2362+source = "git+https://github.com/tree-sitter/tree-sitter?rev=ab09ae20d640711174b8da8a654f6b3dec93da1a#ab09ae20d640711174b8da8a654f6b3dec93da1a"

23632363dependencies = [

23642364 "cc",

23652365 "regex",

Cargo.toml+1−1

@@ -34,4 +34,4 @@ package.helix-tui.opt-level = 2

3434package.helix-term.opt-level = 2

3535

3636[workspace.dependencies]

37−tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "7d4b0110a9e92161d247a051018ee42b0513e98d" }

37+tree-sitter = { version = "0.20", git = "https://github.com/tree-sitter/tree-sitter", rev = "ab09ae20d640711174b8da8a654f6b3dec93da1a" }

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>>,