fix(templ): cssxref and jsxref double issue reporting

mdn · Nov 20, 2024 · c20851b · c20851b
1 parent c970527
commit c20851b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/crates/rari-doc/src/templ/api.rs b/crates/rari-doc/src/templ/api.rs
@@ -21,17 +21,27 @@ impl RariApi {
     pub fn live_sample_base_url() -> &'static str {
         &settings().live_samples_base_url
     }
+    pub fn get_page_nowarn(url: &str) -> Result<Page, DocError> {
+        RariApi::get_page_internal(url, false)
+    }
+
     pub fn get_page(url: &str) -> Result<Page, DocError> {
+        RariApi::get_page_internal(url, true)
+    }
+
+    fn get_page_internal(url: &str, warn: bool) -> Result<Page, DocError> {
         let redirect = resolve_redirect(url);
         let url = match redirect.as_ref() {
             Some(redirect) => {
-                let ic = get_issue_couter();
-                tracing::warn!(
-                    source = "macro-redirected-link",
-                    ic = ic,
-                    url = url,
-                    href = redirect.as_ref()
-                );
+                if warn {
+                    let ic = get_issue_couter();
+                    tracing::warn!(
+                        source = "macro-redirected-link",
+                        ic = ic,
+                        url = url,
+                        href = redirect.as_ref()
+                    );
+                }
                 if deny_warnings() {
                     return Err(DocError::RedirectedLink {
                         from: url.to_string(),

diff --git a/crates/rari-doc/src/templ/templs/links/cssxref.rs b/crates/rari-doc/src/templ/templs/links/cssxref.rs
@@ -51,7 +51,7 @@ pub fn cssxref_internal(
 
     let display_name = if display_name.is_some() {
         maybe_display_name.to_string()
-    } else if let Ok(doc) = RariApi::get_page(&url) {
+    } else if let Ok(doc) = RariApi::get_page_nowarn(&url) {
         match doc.page_type() {
             PageType::CssFunction if !maybe_display_name.ends_with("()") => {
                 format!("{maybe_display_name}()")

diff --git a/crates/rari-doc/src/templ/templs/links/jsxref.rs b/crates/rari-doc/src/templ/templs/links/jsxref.rs
@@ -26,8 +26,8 @@ pub fn jsxref(
     let page_url = format!("{url}{slug}");
     let object_page_url = format!("{url}{global_objects}/{slug}");
 
-    let page = RariApi::get_page(&page_url);
-    let object_page = RariApi::get_page(&object_page_url);
+    let page = RariApi::get_page_nowarn(&page_url);
+    let object_page = RariApi::get_page_nowarn(&object_page_url);
     if let Ok(_page) = page {
         url.push_str(&slug)
     } else if let Ok(_object_page) = object_page {