diff --git a/helix-core/src/movement.rs b/helix-core/src/movement.rs index 003a1f370..2b29f36de 100644 --- a/helix-core/src/movement.rs +++ b/helix-core/src/movement.rs @@ -1,4 +1,4 @@ -use std::iter; +use std::{cmp::Reverse, iter}; use ropey::iter::Chars; use tree_sitter::{Node, QueryCursor}; @@ -527,10 +527,10 @@ pub fn goto_treesitter_object( let node = match dir { Direction::Forward => nodes .filter(|n| n.start_byte() > byte_pos) - .min_by_key(|n| n.start_byte())?, + .min_by_key(|n| (n.start_byte(), Reverse(n.end_byte())))?, Direction::Backward => nodes .filter(|n| n.end_byte() < byte_pos) - .max_by_key(|n| n.end_byte())?, + .max_by_key(|n| (n.end_byte(), Reverse(n.start_byte())))?, }; let len = slice.len_bytes();