Removed the enum and made plain src blocks just highlighted src blocks with only plain text in them.

This commit is contained in:
Tom Alexander
2025-02-22 15:55:16 -05:00
parent e34e2ef75f
commit 7e934cd360
2 changed files with 31 additions and 43 deletions

View File

@@ -6,38 +6,20 @@ use crate::intermediate::ISrcBlock;
use super::macros::render;
#[derive(Debug, Serialize)]
#[serde(untagged)]
pub(crate) enum RenderSrcBlock {
Plain(RenderPlainSrcBlock),
Highlighted(RenderHighlightedSrcBlock),
}
#[derive(Debug, Serialize)]
#[serde(tag = "type")]
#[serde(rename = "src_block")]
pub(crate) struct RenderPlainSrcBlock {
lines: Vec<String>,
language: Option<String>,
post_blank: organic::types::PostBlank,
}
#[derive(Debug, Serialize)]
#[serde(tag = "type")]
#[serde(rename = "highlighted_src_block")]
pub(crate) struct RenderHighlightedSrcBlock {
pub(crate) struct RenderSrcBlock {
lines: Vec<String>,
language: Option<String>,
post_blank: organic::types::PostBlank,
}
render!(RenderSrcBlock, ISrcBlock, original, _render_context, {
match original {
ISrcBlock::Plain(plain_src_block) => Ok(RenderSrcBlock::Plain(RenderPlainSrcBlock {
lines: plain_src_block.lines.clone(),
language: plain_src_block.language.clone(),
post_blank: plain_src_block.post_blank,
})),
ISrcBlock::Highlighted(_) => todo!(),
}
Ok(RenderSrcBlock {
// lines: original.lines.clone(),
lines: Vec::new(),
language: original.language.clone(),
post_blank: original.post_blank,
})
});