fnmain/jotdown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

inline: extract merge_str_events

Browse source 
decrease size of inline::Parser::next, make more readable
This commit is contained in:
Noah Hellman 2023-02-27 21:12:13 +01:00
parent 1b7bb25519
commit 08ef15655b
1 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/inline.rs
View file

@ -684,6 +684,24 @@ impl<'s> Parser<'s> {
self.push(EventKind::Atom(atom)) self.push(EventKind::Atom(atom))
} }
fn merge_str_events(&mut self, span_str: Span) -> Event {
let mut span = span_str;
let should_merge = |e: &Event, span: Span| {
matches!(
e.kind,
EventKind::Str | EventKind::Whitespace | EventKind::Placeholder
) && span.end() == e.span.start()
};
while self.events.front().map_or(false, |e| should_merge(e, span)) {
let ev = self.events.pop_front().unwrap();
span = span.union(ev.span);
}
Event {
kind: EventKind::Str,
span,
}
}
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@ -862,30 +880,11 @@ impl<'s> Iterator for Parser<'s> {
self.push(EventKind::Exit(ty_opener)); self.push(EventKind::Exit(ty_opener));
} }
self.events.pop_front().and_then(|e| { self.events.pop_front().and_then(|e| match e.kind {
match e.kind {
EventKind::Str if e.span.is_empty() => self.next(), EventKind::Str if e.span.is_empty() => self.next(),
EventKind::Str | EventKind::Whitespace => { EventKind::Str | EventKind::Whitespace => Some(self.merge_str_events(e.span)),
// merge str events
let mut span = e.span;
let should_merge = |e: &Event, span: Span| {
matches!(
e.kind,
EventKind::Str | EventKind::Whitespace | EventKind::Placeholder
) && span.end() == e.span.start()
};
while self.events.front().map_or(false, |e| should_merge(e, span)) {
let ev = self.events.pop_front().unwrap();
span = span.union(ev.span);
}
Some(Event {
kind: EventKind::Str,
span,
})
}
EventKind::Placeholder => self.next(), EventKind::Placeholder => self.next(),
_ => Some(e), _ => Some(e),
}
}) })
} }
} }