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

block: allow repeating '#' in headings

Browse source
This commit is contained in:
Noah Hellman 2023-01-29 11:25:44 +01:00
parent 451b2360f4
commit bfa58dfc0d
2 changed files with 51 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/block.rs
View file

@ -293,6 +293,11 @@ impl<'s> TreeParser<'s> {
self.open_sections.push(*level);
self.tree.enter(Node::Container(Section), span);
}
// trim '#' characters
for line in lines[1..].iter_mut() {
*line = line.trim_start_matches(self.src, |c| c == '#' || c.is_whitespace());
}
}
self.tree.enter(Node::Leaf(leaf), span);
@ -797,7 +802,10 @@ impl Kind {
..
} => false,
Self::Blockquote => matches!(next, Self::Blockquote | Self::Paragraph),
Self::Heading { .. } => matches!(next, Self::Paragraph),
Self::Heading { level } => {
matches!(next, Self::Paragraph)
|| matches!(next, Self::Heading { level: l } if l == *level )
}
Self::Paragraph | Self::Table { caption: true } => {
!matches!(next, Self::Atom(Blankline))
}
@ -964,6 +972,26 @@ mod test {
);
}
#[test]
fn parse_heading() {
test_parse!(
concat!(
"# a\n",
"## b\n", //
),
(Enter(Container(Section)), "#"),
(Enter(Leaf(Heading)), "#"),
(Inline, "a"),
(Exit(Leaf(Heading)), "#"),
(Enter(Container(Section)), "##"),
(Enter(Leaf(Heading)), "##"),
(Inline, "b"),
(Exit(Leaf(Heading)), "##"),
(Exit(Container(Section)), "##"),
(Exit(Container(Section)), "#"),
);
}
#[test]
fn parse_heading_multi() {
test_parse!(
@ -990,6 +1018,24 @@ mod test {
);
}
#[test]
fn parse_heading_multi_repeat() {
test_parse!(
concat!(
"# a\n",
"# b\n",
"c\n", //
),
(Enter(Container(Section)), "#"),
(Enter(Leaf(Heading)), "#"),
(Inline, "a\n"),
(Inline, "b\n"),
(Inline, "c"),
(Exit(Leaf(Heading)), "#"),
(Exit(Container(Section)), "#"),
);
}
#[test]
fn parse_section() {
test_parse!(