suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure non empty grouped nodes in textobject queries

pull/1726/head
Gokul Soumya 2022-02-26 20:14:43 +05:30 committed by Blaž Hrastnik
parent e6c36e82cf
commit e83cdf3fd3
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
helix-core/src/syntax.rs
View File

@ -246,6 +246,7 @@ pub struct TextObjectQuery {
pub enum CapturedNode<'a> { pub enum CapturedNode<'a> {
Single(Node<'a>), Single(Node<'a>),
/// Guarenteed to be not empty
Grouped(Vec<Node<'a>>), Grouped(Vec<Node<'a>>),
} }
@ -318,7 +319,12 @@ impl TextObjectQuery {
let iter: Box<dyn Iterator<Item = CapturedNode>> = match quantifier { let iter: Box<dyn Iterator<Item = CapturedNode>> = match quantifier {
CaptureQuantifier::OneOrMore | CaptureQuantifier::ZeroOrMore => { 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)), _ => Box::new(nodes.map(CapturedNode::Single)),
}; };