talexander/organic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix plain list item parser to not consume trailing whitespace on the last element.

Browse Source
This commit is contained in:
Tom Alexander 2023-04-14 19:32:08 -04:00
parent 08fed1301e
commit 143ac49777
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/parser/plain_list.rs
View File

@ -128,13 +128,13 @@ pub fn plain_list_item<'r, 's>(
exit_matcher: ChainBehavior::AndParent(Some(&plain_list_item_end)), exit_matcher: ChainBehavior::AndParent(Some(&plain_list_item_end)),
})); }));
let without_consume_context = context let without_consume_context = context
.with_additional_node(ContextElement::ConsumeTrailingWhitespace(false))
.with_additional_node(ContextElement::ListItem(indent_level)) .with_additional_node(ContextElement::ListItem(indent_level))
.with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode { .with_additional_node(ContextElement::ExitMatcherNode(ExitMatcherNode {
exit_matcher: ChainBehavior::AndParent(Some(&plain_list_item_end)), exit_matcher: ChainBehavior::AndParent(Some(&plain_list_item_end)),
})); }));
let element_matcher = parser_with_context!(element)(&with_consume_context); let with_consume_matcher = parser_with_context!(element)(&with_consume_context);
let without_consume_matcher = parser_with_context!(element)(&with_consume_context);
let exit_matcher = parser_with_context!(exit_matcher_parser)(&with_consume_context); let exit_matcher = parser_with_context!(exit_matcher_parser)(&with_consume_context);
let (remaining, bull) = let (remaining, bull) =
verify(bullet, |bull: &str| bull != "*" || indent_level > 0)(remaining)?; verify(bullet, |bull: &str| bull != "*" || indent_level > 0)(remaining)?;
@ -155,9 +155,12 @@ pub fn plain_list_item<'r, 's>(
} }
Err(_) => { Err(_) => {
let (remaining, _ws) = space1(remaining)?; let (remaining, _ws) = space1(remaining)?;
// TODO: The problem is we are not capturing trailing whitespace for elements that are before the last element. let (remaining, (mut contents, (final_element, _exit_contents))) =
let (remaining, (contents, _exit_contents)) = many_till(
many_till(element_matcher, exit_matcher)(remaining)?; with_consume_matcher,
tuple((without_consume_matcher, exit_matcher)),
)(remaining)?;
contents.push(final_element);
let source = get_consumed(input, remaining); let source = get_consumed(input, remaining);
return Ok(( return Ok((
remaining, remaining,