@@ -31,6 +31,7 @@ pub fn highlighted_code_block<'a>(
3131 language: &str,
3232 theme: Option<&Theme>,
3333 config_loader: Arc<syntax::Loader>,
34+ additional_highlight_spans: Option<Vec<(usize, std::ops::Range<usize>)>>,
3435) -> Text<'a> {
3536 let mut spans = Vec::new();
3637 let mut lines = Vec::new();
@@ -55,10 +56,19 @@ pub fn highlighted_code_block<'a>(
5556 None => return styled_multiline_text(text, code_style),
5657 };
5758
58− let mut highlights = Vec::new();
59+ let highlight_iter = syntax
60+ .highlight_iter(rope.slice(..), None, None)
61+ .map(|e| e.unwrap());
62+ let highlight_iter: Box<dyn Iterator<Item = HighlightEvent>> =
63+ if let Some(spans) = additional_highlight_spans {
64+ Box::new(helix_core::syntax::merge(highlight_iter, spans))
65+ } else {
66+ Box::new(highlight_iter)
67+ };
5968
60− for event in syntax.highlight_iter(rope.slice(..), None, None) {
61− match event.unwrap() {
69+ let mut highlights = Vec::new();
70+ for event in highlight_iter {
71+ match event {
6272 HighlightEvent::HighlightStart(span) => {
6373 highlights.push(span);
6474 }
@@ -66,10 +76,9 @@ pub fn highlighted_code_block<'a>(
6676 highlights.pop();
6777 }
6878 HighlightEvent::Source { start, end } => {
69− let style = match highlights.first() {
70− Some(span) => theme.get(&theme.scopes()[span.0]),
71− None => text_style,
72− };
79+ let style = highlights
80+ .iter()
81+ .fold(text_style, |acc, span| acc.patch(theme.highlight(span.0)));
7382
7483 let mut slice = &text[start..end];
7584 // TODO: do we need to handle all unicode line endings
@@ -195,6 +204,7 @@ impl Markdown {
195204 language,
196205 theme,
197206 Arc::clone(&self.config_loader),
207+ None,
198208 );
199209 lines.extend(tui_text.lines.into_iter());
200210 } else {