Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve rendering of multi-paragraph list items in hover markdown

Browse source
This commit is contained in:
Max Brunsfeld 2023-04-26 17:09:20 -07:00
parent d298ce3fd3
commit c6abb0db3a
1 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

36
crates/editor/src/hover_popover.rs
View file

@ -281,7 +281,7 @@ fn render_blocks(
for block in blocks { for block in blocks {
match &block.kind { match &block.kind {
HoverBlockKind::PlainText => { HoverBlockKind::PlainText => {
new_paragraph(&mut text); new_paragraph(&mut text, &mut Vec::new());
text.push_str(&block.text); text.push_str(&block.text);
} }
HoverBlockKind::Markdown => { HoverBlockKind::Markdown => {
@ -347,13 +347,13 @@ fn render_blocks(
)); ));
} }
Event::Start(tag) => match tag { Event::Start(tag) => match tag {
Tag::Paragraph => new_paragraph(&mut text), Tag::Paragraph => new_paragraph(&mut text, &mut list_stack),
Tag::Heading(_, _, _) => { Tag::Heading(_, _, _) => {
new_paragraph(&mut text); new_paragraph(&mut text, &mut list_stack);
bold_depth += 1; bold_depth += 1;
} }
Tag::CodeBlock(kind) => { Tag::CodeBlock(kind) => {
new_paragraph(&mut text); new_paragraph(&mut text, &mut list_stack);
if let CodeBlockKind::Fenced(language) = kind { if let CodeBlockKind::Fenced(language) = kind {
current_language = language_registry current_language = language_registry
.language_for_name(language.as_ref()) .language_for_name(language.as_ref())
@ -364,19 +364,25 @@ fn render_blocks(
Tag::Emphasis => italic_depth += 1, Tag::Emphasis => italic_depth += 1,
Tag::Strong => bold_depth += 1, Tag::Strong => bold_depth += 1,
Tag::Link(_, url, _) => link_url = Some((prev_len, url)), Tag::Link(_, url, _) => link_url = Some((prev_len, url)),
Tag::List(number) => list_stack.push(number), Tag::List(number) => {
list_stack.push((number, false));
}
Tag::Item => { Tag::Item => {
let len = list_stack.len(); let len = list_stack.len();
if let Some(list_state) = list_stack.last_mut() { if let Some((list_number, has_content)) = list_stack.last_mut() {
new_paragraph(&mut text); *has_content = false;
if !text.is_empty() && !text.ends_with('\n') {
text.push('\n');
}
for _ in 0..len - 1 { for _ in 0..len - 1 {
text.push_str(" "); text.push_str(" ");
} }
if let Some(number) = list_state { if let Some(number) = list_number {
text.push_str(&format!("{}. ", number)); text.push_str(&format!("{}. ", number));
*number += 1; *number += 1;
*has_content = false;
} else { } else {
text.push_str("* "); text.push_str("• ");
} }
} }
} }
@ -443,13 +449,23 @@ fn render_code(
} }
} }
fn new_paragraph(text: &mut String) { fn new_paragraph(text: &mut String, list_stack: &mut Vec<(Option<u64>, bool)>) {
if let Some((_, has_content)) = list_stack.last_mut() {
if !*has_content {
*has_content = true;
return;
}
}
if !text.is_empty() { if !text.is_empty() {
if !text.ends_with('\n') { if !text.ends_with('\n') {
text.push('\n'); text.push('\n');
} }
text.push('\n'); text.push('\n');
} }
for _ in 0..list_stack.len().saturating_sub(1) {
text.push_str(" ");
}
} }
#[derive(Default)] #[derive(Default)]