on master help sign in
Fix next/prev tree-sitter inconsistency (#7332)
a4a8612A-Walrus
helix-core/src/movement.rs+3−3
@@ -1,4 +1,4 @@
1−use std::iter;
1+use std::{cmp::Reverse, iter};
2
2
3use ropey::iter::Chars;
3use ropey::iter::Chars;
4use tree_sitter::{Node, QueryCursor};
4use tree_sitter::{Node, QueryCursor};
@@ -527,10 +527,10 @@ pub fn goto_treesitter_object(
527 let node = match dir {
527 let node = match dir {
528 Direction::Forward => nodes
528 Direction::Forward => nodes
529 .filter(|n| n.start_byte() > byte_pos)
529 .filter(|n| n.start_byte() > byte_pos)
530− .min_by_key(|n| n.start_byte())?,
530+ .min_by_key(|n| (n.start_byte(), Reverse(n.end_byte())))?,
531 Direction::Backward => nodes
531 Direction::Backward => nodes
532 .filter(|n| n.end_byte() < byte_pos)
532 .filter(|n| n.end_byte() < byte_pos)
533− .max_by_key(|n| n.end_byte())?,
533+ .max_by_key(|n| (n.end_byte(), Reverse(n.start_byte())))?,
534 };
534 };
535
535
536 let len = slice.len_bytes();
536 let len = slice.len_bytes();