Implement nested lists
This commit is contained in:
parent
e351152ab7
commit
e42c67676d
11 changed files with 475 additions and 131 deletions
|
|
@ -9,7 +9,8 @@ use crate::{
|
|||
lexeme::Lexeme,
|
||||
state::State,
|
||||
token::{
|
||||
Token, checkbox::CheckBox, header::Header, item::Item, list::List, literal::Literal, paragraph::Paragraph, preformat::PreFormat
|
||||
Token, header::Header, list::List, literal::Literal,
|
||||
paragraph::Paragraph, preformat::PreFormat,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -42,15 +43,10 @@ pub fn parse(
|
|||
tokens.push(Token::Header(header));
|
||||
return true;
|
||||
} else if List::probe(lexeme) {
|
||||
let ordered = lexeme.match_as_char('+');
|
||||
log!("Block Context: None -> Item on {lexeme}");
|
||||
state.context.block = Block::Item(ordered);
|
||||
tokens.push(Token::List(List::new(true, ordered)));
|
||||
tokens.push(Token::Item(Item::new(true)));
|
||||
// List::probe implies a dash followed by a space,
|
||||
// both of which sould not be rendered literally
|
||||
iterator.next();
|
||||
return true;
|
||||
log!("Block Context: None -> List on {lexeme}");
|
||||
state.context.block = Block::List;
|
||||
state.buffers.list.candidate.ordered = lexeme.match_char('+');
|
||||
return super::list::parse(lexeme, state, tokens, iterator);
|
||||
} else if Paragraph::probe(lexeme) {
|
||||
log!("Block Context: None -> Paragraph on {lexeme}");
|
||||
state.context.block = Block::Paragraph;
|
||||
|
|
@ -81,33 +77,8 @@ pub fn parse(
|
|||
state.context.block = Block::None;
|
||||
}
|
||||
},
|
||||
Block::List(ordered) => {
|
||||
if List::probe_end(lexeme) {
|
||||
tokens.push(Token::List(List::new(false, ordered)));
|
||||
log!("Block Context: List -> None on {lexeme}");
|
||||
state.context.block = Block::None;
|
||||
} else if Item::probe(lexeme) {
|
||||
tokens.push(Token::Item(Item::new(true)));
|
||||
log!("Block Context: List -> Item on {lexeme}");
|
||||
state.context.block = Block::Item(ordered);
|
||||
// Item::probe implies a dash followed by a space,
|
||||
// both of which sould not be rendered literally
|
||||
iterator.next();
|
||||
return true;
|
||||
}
|
||||
},
|
||||
Block::Item(ordered) => {
|
||||
if CheckBox::probe(lexeme) {
|
||||
log!("Probed CheckBox: {lexeme}");
|
||||
tokens.push(Token::CheckBox(CheckBox::lex(lexeme)));
|
||||
iterator.next();
|
||||
iterator.next();
|
||||
return true
|
||||
} else if Item::probe_end(lexeme) {
|
||||
tokens.push(Token::Item(Item::new(false)));
|
||||
log!("Block Context: Item -> List on {lexeme}");
|
||||
state.context.block = Block::List(ordered);
|
||||
}
|
||||
Block::List => {
|
||||
return super::list::parse(lexeme, state, tokens, iterator);
|
||||
},
|
||||
}
|
||||
false
|
||||
|
|
@ -176,28 +147,4 @@ mod tests {
|
|||
let level = Level::from(u);
|
||||
assert_eq!(level.to_string(), "6");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unordered_list_at_eoi() {
|
||||
assert_eq!(
|
||||
read("- a\n- b\n- c"),
|
||||
"<ul><li>a</li>\n<li>b</li>\n<li>c</li></ul>"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unordered_list_with_content_before() {
|
||||
assert_eq!(
|
||||
read("_e e_\n\n- a\n- b\n- c"),
|
||||
"<p><em>e e</em></p>\n\n<ul><li>a</li>\n<li>b</li>\n<li>c</li></ul>",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unordered_list_with_content_after() {
|
||||
assert_eq!(
|
||||
read("- a\n- b\n- c\n\nd",),
|
||||
"<ul><li>a</li>\n<li>b</li>\n<li>c</li>\n</ul>\n<p>d</p>"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
258
src/syntax/content/parser/context/list.rs
Normal file
258
src/syntax/content/parser/context/list.rs
Normal file
|
|
@ -0,0 +1,258 @@
|
|||
use std::{iter::Peekable, slice::Iter};
|
||||
|
||||
use crate::{
|
||||
prelude::*,
|
||||
syntax::content::parser::{
|
||||
context::Block,
|
||||
lexeme::Lexeme,
|
||||
state::{ListBuffer, State},
|
||||
token::{Token, item::Item},
|
||||
},
|
||||
};
|
||||
|
||||
/// Handles open list contexts until a list is fully parsed.
|
||||
///
|
||||
/// A return of `true` will trigger a continue in the outer parser,
|
||||
/// skipping any further parsing of the current lexeme.
|
||||
///
|
||||
/// # Panics
|
||||
/// This parser can handle only the List context, and will panic if passed an
|
||||
/// unrelated context since it has no knowledge on how to handle them.
|
||||
pub fn parse(
|
||||
lexeme: &Lexeme,
|
||||
state: &mut State,
|
||||
tokens: &mut Vec<Token>,
|
||||
iterator: &mut Peekable<Iter<'_, Lexeme>>,
|
||||
) -> bool {
|
||||
let buffer = &mut state.buffers.list;
|
||||
let candidate = &mut buffer.candidate;
|
||||
let item_candidate = &mut buffer.item_candidate;
|
||||
|
||||
match state.context.block {
|
||||
Block::List => {
|
||||
if lexeme.match_char(' ') && item_candidate.depth.is_none() {
|
||||
// found space, unknown increasing depth
|
||||
buffer.depth = buffer.depth.saturating_add(1);
|
||||
} else if item_candidate.depth.is_none()
|
||||
&& lexeme.match_either_char('-', '+')
|
||||
{
|
||||
// found bullet, depth now known
|
||||
item_candidate.depth = Some(buffer.depth);
|
||||
if lexeme.match_next_char(' ') {
|
||||
iterator.next();
|
||||
}
|
||||
} else if lexeme.last() || lexeme.match_char_sequence('\n', '\n') {
|
||||
// found end of list
|
||||
if !lexeme.match_char('\n') {
|
||||
// no trailing break, last item's text wouldn't be pushed
|
||||
item_candidate.text.push_str(&lexeme.text());
|
||||
}
|
||||
if item_candidate.depth.is_some() {
|
||||
// if the current item candidate has a known depth, push it
|
||||
candidate.items.push(item_candidate.clone());
|
||||
}
|
||||
// push list candidate, reset state and exit context
|
||||
log!("Accepting list candidate {candidate}");
|
||||
tokens.push(Token::List(candidate.clone()));
|
||||
state.context.block = Block::None;
|
||||
iterator.next();
|
||||
*buffer = ListBuffer::default();
|
||||
} else if lexeme.match_char('\n') {
|
||||
// found end of item, push it and reset state
|
||||
log!("Accepting item candidate {item_candidate}");
|
||||
candidate.items.push(item_candidate.clone());
|
||||
*item_candidate = Item::default();
|
||||
buffer.depth = 0;
|
||||
} else {
|
||||
// anything else is pushed into the candidate item's text
|
||||
item_candidate.text.push_str(&lexeme.text());
|
||||
}
|
||||
},
|
||||
Block::None
|
||||
| Block::Paragraph
|
||||
| Block::Header(_)
|
||||
| Block::PreFormat => {
|
||||
panic!("List context parser called to handle non-list context")
|
||||
},
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::{syntax::content::parser, types::Graph};
|
||||
|
||||
fn read(input: &str) -> String {
|
||||
parser::read(input, &Graph::new(None).meta.config)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unordered_list() {
|
||||
assert_eq!(
|
||||
read("- a\n- b\n- c"),
|
||||
"\n<ul>\n\
|
||||
<li>a</li>\n\
|
||||
<li>b</li>\n\
|
||||
<li>c</li>\n\
|
||||
</ul>\n\n"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn minimally_nested_unordered_list() {
|
||||
assert_eq!(
|
||||
read("- a\n - b"),
|
||||
"\n<ul>\n\
|
||||
<li>a<ul>\n\
|
||||
<li>b</li></ul></li>\n\
|
||||
</ul>\n\n"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unordered_nested_list() {
|
||||
assert_eq!(
|
||||
read(concat!(
|
||||
"- 0Aa\n",
|
||||
" - 4Ba\n",
|
||||
"- 0Ca\n",
|
||||
" - 4Da\n",
|
||||
" - 4Db\n",
|
||||
"- 0Ea\n",
|
||||
"- 0Eb"
|
||||
)),
|
||||
"\n<ul>\n\
|
||||
<li>0Aa<ul>\n\
|
||||
<li>4Ba</li></ul></li>\n\
|
||||
<li>0Ca<ul>\n\
|
||||
<li>4Da</li>\n\
|
||||
<li>4Db</li></ul></li>\n\
|
||||
<li>0Ea</li>\n\
|
||||
<li>0Eb</li>\n\
|
||||
</ul>\n\n"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unordered_list_as_eoi() {
|
||||
assert_eq!(
|
||||
read("some\n\n- a\n- b"),
|
||||
"<p>some</p>\n\n\n<ul>\n\
|
||||
<li>a</li>\n\
|
||||
<li>b</li>\n\
|
||||
</ul>\n\n"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unordered_list_as_soi() {
|
||||
assert_eq!(
|
||||
read("- a\n- b\n\nsome"),
|
||||
"\n<ul>\n\
|
||||
<li>a</li>\n\
|
||||
<li>b</li>\n\
|
||||
</ul>\n\n<p>some</p>"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unordered_list_after_newline() {
|
||||
assert_eq!(
|
||||
read("\n- a\n- b"),
|
||||
"\n\n<ul>\n\
|
||||
<li>a</li>\n\
|
||||
<li>b</li>\n\
|
||||
</ul>\n\n"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unordered_list_after_two_newlines() {
|
||||
assert_eq!(
|
||||
read("\n\n- a\n- b"),
|
||||
"\n\n\n<ul>\n\
|
||||
<li>a</li>\n\
|
||||
<li>b</li>\n\
|
||||
</ul>\n\n"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unordered_list_after_three_newlines() {
|
||||
assert_eq!(
|
||||
read("\n\n\n- a\n- b"),
|
||||
"\n\n\n\n<ul>\n\
|
||||
<li>a</li>\n\
|
||||
<li>b</li>\n\
|
||||
</ul>\n\n"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unordered_list_before_newline() {
|
||||
assert_eq!(
|
||||
read("- a\n- b\n"),
|
||||
"\n<ul>\n\
|
||||
<li>a</li>\n\
|
||||
<li>b</li>\n\
|
||||
</ul>\n\n"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unordered_list_before_two_newlines() {
|
||||
assert_eq!(
|
||||
read("- a\n- b\n\n"),
|
||||
"\n<ul>\n\
|
||||
<li>a</li>\n\
|
||||
<li>b</li>\n\
|
||||
</ul>\n\n"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unordered_list_before_three_newlines() {
|
||||
assert_eq!(
|
||||
read("- a\n- b\n\n\n"),
|
||||
"\n<ul>\n\
|
||||
<li>a</li>\n\
|
||||
<li>b</li>\n\
|
||||
</ul>\n\n"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unordered_list_before_three_newlines_then_literals() {
|
||||
assert_eq!(
|
||||
read("- a\n- b\n\n\nw w"),
|
||||
"\n<ul>\n\
|
||||
<li>a</li>\n\
|
||||
<li>b</li>\n\
|
||||
</ul>\n\n\n<p>w w</p>"
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unordered_nested_list_multilevel_depth_drop() {
|
||||
assert_eq!(
|
||||
read(concat!(
|
||||
"- 0Aa\n",
|
||||
" - 4Ba\n",
|
||||
" - 8Ca\n",
|
||||
" - 12Da\n",
|
||||
" - 16Ea\n",
|
||||
" - 8Fa\n",
|
||||
"- 0Ga\n\n",
|
||||
)),
|
||||
"\n<ul>\n\
|
||||
<li>0Aa<ul>\n\
|
||||
<li>4Ba<ul>\n\
|
||||
<li>8Ca<ul>\n\
|
||||
<li>12Da<ul>\n\
|
||||
<li>16Ea</li></ul></li></ul></li>\n\
|
||||
<li>8Fa</li></ul></li></ul></li>\n\
|
||||
<li>0Ga</li>\n\
|
||||
</ul>\n\n"
|
||||
);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue