FediMovies/fedimovies
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Activity

Fix parsing of ordered lists

Browse source
This commit is contained in:
silverpill 2022-11-13 20:20:57 +00:00
parent c11daa21a0
commit 43f99b597a
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/utils/markdown.rs
View file

@ -1,7 +1,7 @@
use comrak::{ use comrak::{
format_commonmark, format_commonmark,
format_html, format_html,
nodes::{Ast, AstNode, NodeValue}, nodes::{Ast, AstNode, ListType, NodeValue},
parse_document, parse_document,
Arena, Arena,
ComrakOptions, ComrakOptions,
@ -113,8 +113,16 @@ pub fn markdown_to_html(text: &str) -> Result<String, MarkdownError> {
}; };
paragraph.detach(); paragraph.detach();
}; };
let list_prefix_markdown = let mut list_prefix_markdown =
node_to_markdown(list_item, &options)?; node_to_markdown(list_item, &options)?;
if let NodeValue::Item(item) = list_item.data.borrow().value {
if item.list_type == ListType::Ordered {
// Preserve numbering in ordered lists
let item_index_str = item.start.to_string();
list_prefix_markdown =
list_prefix_markdown.replace('1', &item_index_str);
};
};
let list_prefix = let list_prefix =
NodeValue::Text(list_prefix_markdown.as_bytes().to_vec()); NodeValue::Text(list_prefix_markdown.as_bytes().to_vec());
if !replacements.is_empty() { if !replacements.is_empty() {
@ -187,6 +195,14 @@ mod tests {
assert_eq!(html, expected_html); assert_eq!(html, expected_html);
} }
#[test]
fn test_markdown_to_html_ordered_list() {
let text = "1. item 1\n2. item 2\n";
let html = markdown_to_html(text).unwrap();
let expected_html = r#"<p>1. item 1<br>2. item 2</p>"#;
assert_eq!(html, expected_html);
}
#[test] #[test]
fn test_markdown_to_html_mention() { fn test_markdown_to_html_mention() {
let text = "@user@example.org test"; let text = "@user@example.org test";