andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-22 09:26:19 +04:00
Code Issues Projects Releases Wiki Activity

Fix markdown indented code block rendering (#3503)

Browse Source
This commit is contained in:
Clay 2022-08-23 17:12:04 -07:00 committed by GitHub
parent e4c9d4082a
commit 99b1e8ad89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
helix-term/src/ui/markdown.rs
View File

@ -229,10 +229,7 @@ fn push_line<'a>(spans: &mut Vec<Span<'a>>, lines: &mut Vec<Spans<'a>>) {
Event::End(tag) => { Event::End(tag) => {
tags.pop(); tags.pop();
match tag { match tag {
Tag::Heading(_, _, _) Tag::Heading(_, _, _) | Tag::Paragraph | Tag::CodeBlock(_) | Tag::Item => {
| Tag::Paragraph
| Tag::CodeBlock(CodeBlockKind::Fenced(_))
| Tag::Item => {
push_line(&mut spans, &mut lines); push_line(&mut spans, &mut lines);
} }
_ => (), _ => (),
@ -240,17 +237,18 @@ fn push_line<'a>(spans: &mut Vec<Span<'a>>, lines: &mut Vec<Spans<'a>>) {
// whenever heading, code block or paragraph closes, empty line // whenever heading, code block or paragraph closes, empty line
match tag { match tag {
Tag::Heading(_, _, _) Tag::Heading(_, _, _) | Tag::Paragraph | Tag::CodeBlock(_) => {
| Tag::Paragraph
| Tag::CodeBlock(CodeBlockKind::Fenced(_)) => {
lines.push(Spans::default()); lines.push(Spans::default());
} }
_ => (), _ => (),
} }
} }
Event::Text(text) => { Event::Text(text) => {
// TODO: temp workaround if let Some(Tag::CodeBlock(kind)) = tags.last() {
if let Some(Tag::CodeBlock(CodeBlockKind::Fenced(language))) = tags.last() { let language = match kind {
CodeBlockKind::Fenced(language) => language,
CodeBlockKind::Indented => "",
};
let tui_text = highlighted_code_block( let tui_text = highlighted_code_block(
text.to_string(), text.to_string(),
language, language,