Ensure non empty grouped nodes in textobject queries

helix-editor · Mar 1, 2022 · e83cdf3 · e83cdf3
1 parent e6c36e8
commit e83cdf3
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
@@ -246,6 +246,7 @@ pub struct TextObjectQuery {
 
 pub enum CapturedNode<'a> {
     Single(Node<'a>),
+    /// Guarenteed to be not empty
     Grouped(Vec<Node<'a>>),
 }
 
@@ -318,7 +319,12 @@ impl TextObjectQuery {
 
             let iter: Box<dyn Iterator<Item = CapturedNode>> = match quantifier {
                 CaptureQuantifier::OneOrMore | CaptureQuantifier::ZeroOrMore => {
-                    Box::new(std::iter::once(CapturedNode::Grouped(nodes.collect())))
+                    let nodes: Vec<Node> = nodes.collect();
+                    if nodes.is_empty() {
+                        Box::new(std::iter::empty())
+                    } else {
+                        Box::new(std::iter::once(CapturedNode::Grouped(nodes)))
+                    }
                 }
                 _ => Box::new(nodes.map(CapturedNode::Single)),
             };