Support leading whitespace for list items.
This commit is contained in:
@@ -4,15 +4,18 @@ use nom::character::complete::anychar;
|
||||
use nom::character::complete::digit1;
|
||||
use nom::character::complete::line_ending;
|
||||
use nom::character::complete::one_of;
|
||||
use nom::character::complete::space0;
|
||||
use nom::combinator::consumed;
|
||||
use nom::combinator::not;
|
||||
use nom::combinator::opt;
|
||||
use nom::combinator::recognize;
|
||||
use nom::multi::many0_count;
|
||||
use nom::multi::many1;
|
||||
use nom::sequence::tuple;
|
||||
|
||||
use super::combinator::context_many_till;
|
||||
use super::error::Res;
|
||||
use super::paragraph::paragraph_end;
|
||||
use super::text::space;
|
||||
use super::text::text_element;
|
||||
use super::token::ListItem;
|
||||
@@ -25,8 +28,10 @@ pub fn plain_list<'r, 's>(context: Context<'r, 's>, i: &'s str) -> Res<&'s str,
|
||||
todo!()
|
||||
}
|
||||
|
||||
fn item<'r, 's>(context: Context<'r, 's>, i: &'s str) -> Res<&'s str, ListItem<'s>> {
|
||||
let (remaining, (source, (bul, count, check, tg, sp, (contents, end)))) = consumed(tuple((
|
||||
pub fn item<'r, 's>(context: Context<'r, 's>, i: &'s str) -> Res<&'s str, ListItem<'s>> {
|
||||
let (remaining, leading_whitespace) = space0(i)?;
|
||||
let indent_level = leading_whitespace.len();
|
||||
let (remaining, (bul, countset, check, tg, sp, (contents, end))) = tuple((
|
||||
bullet,
|
||||
opt(tuple((space, counter_set))),
|
||||
opt(tuple((space, check_box))),
|
||||
@@ -34,7 +39,7 @@ fn item<'r, 's>(context: Context<'r, 's>, i: &'s str) -> Res<&'s str, ListItem<'
|
||||
space,
|
||||
// TODO: This context should probably be something involving the item
|
||||
context_many_till(context, text_element, item_end),
|
||||
)))(i)?;
|
||||
))(remaining)?;
|
||||
|
||||
let elements = contents
|
||||
.into_iter()
|
||||
@@ -44,10 +49,16 @@ fn item<'r, 's>(context: Context<'r, 's>, i: &'s str) -> Res<&'s str, ListItem<'
|
||||
})
|
||||
.collect();
|
||||
|
||||
let source = {
|
||||
let offset = remaining.as_ptr() as usize - i.as_ptr() as usize;
|
||||
&i[..offset]
|
||||
};
|
||||
|
||||
let ret = ListItem {
|
||||
source,
|
||||
leading_whitespace,
|
||||
bullet: bul,
|
||||
counter_set: count.map(|(_spc, count)| count),
|
||||
counter_set: countset.map(|(_spc, count)| count),
|
||||
check_box: check.map(|(_spc, check)| check),
|
||||
item_tag: tg.map(|(_spc, tg)| tg),
|
||||
contents: elements,
|
||||
@@ -94,6 +105,5 @@ fn tag_separator<'s>(i: &'s str) -> Res<&'s str, &'s str> {
|
||||
}
|
||||
|
||||
pub fn item_end<'r, 's>(context: Context<'r, 's>, i: &'s str) -> Res<&'s str, &'s str> {
|
||||
// todo
|
||||
todo!()
|
||||
paragraph_end(i)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user