From 330acdcfc7d803b5bcc4656a9dcc093dad0339ee Mon Sep 17 00:00:00 2001 From: Florian Dieminger Date: Wed, 1 Jan 2025 16:36:09 +0100 Subject: [PATCH] fix(templ): support argument for cssyntax --- crates/rari-cli/serve.rs | 7 ++++--- crates/rari-doc/src/templ/templs/csssyntax.rs | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/crates/rari-cli/serve.rs b/crates/rari-cli/serve.rs index c4ba74b6..37b6834e 100644 --- a/crates/rari-cli/serve.rs +++ b/crates/rari-cli/serve.rs @@ -61,9 +61,10 @@ async fn get_json_handler(req: Request) -> Result, AppError> { tracing::info!("{url}"); if let BuiltPage::Doc(json_doc) = &mut json { let m = IN_MEMORY.get_events(); - if let Some((_, req_issues)) = m.remove(page.full_path().to_string_lossy().as_ref()) { - json_doc.doc.flaws = Some(to_display_issues(req_issues, &page)); - } + let (_, req_issues) = m + .remove(page.full_path().to_string_lossy().as_ref()) + .unwrap_or_default(); + json_doc.doc.flaws = Some(to_display_issues(req_issues, &page)); } Ok(Json(json)) } diff --git a/crates/rari-doc/src/templ/templs/csssyntax.rs b/crates/rari-doc/src/templ/templs/csssyntax.rs index 029afc95..bdaa4876 100644 --- a/crates/rari-doc/src/templ/templs/csssyntax.rs +++ b/crates/rari-doc/src/templ/templs/csssyntax.rs @@ -21,10 +21,11 @@ static TOOLTIPS: LazyLock> = LazyLock::new(|| { }); #[rari_f] -pub fn csssyntax() -> Result { +pub fn csssyntax(name: Option) -> Result { let page_type = env.page_type; let mut slug_rev_iter = env.slug.rsplitn(3, '/'); - let name = slug_rev_iter.next().unwrap(); + let slug_name = slug_rev_iter.next().unwrap(); + let name = name.as_deref().unwrap_or(slug_name); let typ = match page_type { rari_types::fm_types::PageType::CssAtRule => CssType::AtRule(name), rari_types::fm_types::PageType::CssAtRuleDescriptor => {