me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix markdown code blocks when highlighter is disabled

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2025-03-18 00:03:34 +01:00
parent 68b992962c
commit 363b0e903a
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
widget/src/markdown.rs
View file

@ -474,6 +474,7 @@ fn parse_with<'a>(
let mut strikethrough = false;
let mut metadata = false;
let mut table = false;
let mut code_block = false;
let mut link = None;
let mut image = None;
let mut stack = Vec::new();
@ -627,6 +628,7 @@ fn parse_with<'a>(
});
}
code_block = true;
code_language =
(!language.is_empty()).then(|| language.into_string());
@ -732,6 +734,8 @@ fn parse_with<'a>(
)
}
pulldown_cmark::TagEnd::CodeBlock if !metadata && !table => {
code_block = false;
#[cfg(feature = "highlighter")]
{
state.borrow_mut().highlighter = highlighter.take();
@ -759,15 +763,29 @@ fn parse_with<'a>(
_ => None,
},
pulldown_cmark::Event::Text(text) if !metadata && !table => {
#[cfg(feature = "highlighter")]
if let Some(highlighter) = &mut highlighter {
if code_block {
code.push_str(&text);
#[cfg(feature = "highlighter")]
if let Some(highlighter) = &mut highlighter {
for line in text.lines() {
code_lines.push(Text::new(
highlighter.highlight_line(line).to_vec(),
));
}
}
#[cfg(not(feature = "highlighter"))]
for line in text.lines() {
code_lines.push(Text::new(vec![Span::Standard {
text: line.to_owned(),
strong,
emphasis,
strikethrough,
link: link.clone(),
code: false,
}]));
}
return None;
}