From 99b1e8ad89aa73b60b43a66a723c52f4b13b97ae Mon Sep 17 00:00:00 2001 From: Clay Date: Tue, 23 Aug 2022 17:12:04 -0700 Subject: [PATCH] Fix markdown indented code block rendering (#3503) --- helix-term/src/ui/markdown.rs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/helix-term/src/ui/markdown.rs b/helix-term/src/ui/markdown.rs index c53b3b669..a0b299e7c 100644 --- a/helix-term/src/ui/markdown.rs +++ b/helix-term/src/ui/markdown.rs @@ -229,10 +229,7 @@ impl Markdown { Event::End(tag) => { tags.pop(); match tag { - Tag::Heading(_, _, _) - | Tag::Paragraph - | Tag::CodeBlock(CodeBlockKind::Fenced(_)) - | Tag::Item => { + Tag::Heading(_, _, _) | Tag::Paragraph | Tag::CodeBlock(_) | Tag::Item => { push_line(&mut spans, &mut lines); } _ => (), @@ -240,17 +237,18 @@ impl Markdown { // whenever heading, code block or paragraph closes, empty line match tag { - Tag::Heading(_, _, _) - | Tag::Paragraph - | Tag::CodeBlock(CodeBlockKind::Fenced(_)) => { + Tag::Heading(_, _, _) | Tag::Paragraph | Tag::CodeBlock(_) => { lines.push(Spans::default()); } _ => (), } } Event::Text(text) => { - // TODO: temp workaround - if let Some(Tag::CodeBlock(CodeBlockKind::Fenced(language))) = tags.last() { + if let Some(Tag::CodeBlock(kind)) = tags.last() { + let language = match kind { + CodeBlockKind::Fenced(language) => language, + CodeBlockKind::Indented => "", + }; let tui_text = highlighted_code_block( text.to_string(), language,