talexander/natter
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Update dust templates to support the new source code block format.

Browse Source
This commit is contained in:
Tom Alexander 2025-02-22 16:13:23 -05:00
parent 4cc04bda46
commit 4ea1a46705
Signed by: talexander
GPG Key ID: D3A179C9A53C0EDE
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
default_environment/templates/html/src_block.dust
View File

@ -4,7 +4,12 @@
<tbody> <tbody>
{#.lines} {#.lines}
<tr> <tr>
<td><code class="src_line">{.}</code></td> <td>{#.children}{@select key=.type}
{@eq value="raw_text"}<code class="src_line">{.content}</code>{/eq}
{@eq value="highlight_start"}<span class="srchl_{.name}">{/eq}
{@eq value="highlight_end"}</span>{/eq}
{@none}{!TODO: make this panic!}ERROR: Unrecognized type {.type}.{/none}
{/select}{/.children}</td>
</tr> </tr>
{/.lines} {/.lines}
</tbody> </tbody>

9
src/context/src_block.rs
View File

@ -17,16 +17,15 @@ pub(crate) struct RenderSrcBlock {
} }
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")]
#[serde(rename = "src_block")]
pub(crate) struct RenderSrcLine { pub(crate) struct RenderSrcLine {
children: Vec<RenderSrcSegment>, children: Vec<RenderSrcSegment>,
} }
#[derive(Debug, Serialize)] #[derive(Debug, Serialize)]
#[serde(tag = "type")]
pub(crate) enum RenderSrcSegment { pub(crate) enum RenderSrcSegment {
#[serde(rename = "raw_text")] #[serde(rename = "raw_text")]
RawText(String), RawText { content: String },
#[serde(rename = "highlight_start")] #[serde(rename = "highlight_start")]
HighlightStart { name: String }, HighlightStart { name: String },
@ -44,7 +43,9 @@ render!(RenderSrcBlock, ISrcBlock, original, _render_context, {
.children .children
.iter() .iter()
.map(|original_segment| match original_segment { .map(|original_segment| match original_segment {
ISrcSegment::RawText(body) => RenderSrcSegment::RawText(body.to_owned()), ISrcSegment::RawText(body) => RenderSrcSegment::RawText {
content: body.to_owned(),
},
ISrcSegment::HighlightStart { name } => RenderSrcSegment::HighlightStart { ISrcSegment::HighlightStart { name } => RenderSrcSegment::HighlightStart {
name: name.to_owned(), name: name.to_owned(),
}, },