Fix edge-case in tree-sitter expand_selection selection command (#2877)

Co-authored-by: Triton171 <[email protected]>
helix-editor · Jun 25, 2022 · e1b1a5e · e1b1a5e
1 parent 1843589
commit e1b1a5e
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/helix-core/src/object.rs b/helix-core/src/object.rs
@@ -2,12 +2,11 @@ use crate::{Range, RopeSlice, Selection, Syntax};
 use tree_sitter::Node;
 
 pub fn expand_selection(syntax: &Syntax, text: RopeSlice, selection: Selection) -> Selection {
-    select_node_impl(syntax, text, selection, |descendant, from, to| {
-        if descendant.start_byte() == from && descendant.end_byte() == to {
-            descendant.parent()
-        } else {
-            Some(descendant)
+    select_node_impl(syntax, text, selection, |mut node, from, to| {
+        while node.start_byte() == from && node.end_byte() == to {
+            node = node.parent()?;
         }
+        Some(node)
     })
 }