From 95f4f56efa3e70e797ff157e1992ea9cd806564d Mon Sep 17 00:00:00 2001
From: 0x009922 <43530070+0x009922@users.noreply.github.com>
Date: Wed, 26 Feb 2025 07:55:38 +0900
Subject: [PATCH 1/2] feat: support `[label]{@link URL}` syntax #690

Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com>
---
 src/html/jsdoc.rs | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/html/jsdoc.rs b/src/html/jsdoc.rs
index 6311e78f..51dd8fa2 100644
--- a/src/html/jsdoc.rs
+++ b/src/html/jsdoc.rs
@@ -10,7 +10,7 @@ use std::rc::Rc;
 
 lazy_static! {
   static ref JSDOC_LINK_RE: regex::Regex = regex::Regex::new(
-    r"(?m)\{\s*@link(?P<modifier>code|plain)?\s+(?P<value>[^}]+)}"
+    r"(?m)(?:\[(?P<label>[^]]+)])?\{\s*@link(?P<modifier>code|plain)?\s+(?P<value>[^}]+)}"
   )
   .unwrap();
   static ref LINK_RE: regex::Regex =
@@ -26,6 +26,7 @@ fn parse_links<'a>(md: &'a str, ctx: &RenderContext) -> Cow<'a, str> {
       .map_or("plain", |modifier_match| modifier_match.as_str())
       == "code";
     let value = captures.name("value").unwrap().as_str();
+    let label = captures.name("label").map(|x| x.as_str());
 
     let (link, mut title) = if let Some((link, title)) =
       value.split_once('|').or_else(|| value.split_once(' '))
@@ -34,6 +35,9 @@ fn parse_links<'a>(md: &'a str, ctx: &RenderContext) -> Cow<'a, str> {
     } else {
       (value, "".to_string())
     };
+    if let Some(label) = label {
+      title = label.trim().to_string();
+    }
 
     let link = if let Some(module_link_captures) = MODULE_LINK_RE.captures(link)
     {
@@ -585,6 +589,18 @@ mod test {
       parse_links("foo {@link https://example.com|Example} bar", &render_ctx),
       "foo [Example](https://example.com) bar"
     );
+    assert_eq!(
+      parse_links("foo [Example]{@link https://example.com} bar", &render_ctx),
+      "foo [Example](https://example.com) bar"
+    );
+    // [label] takes precedence - consistent with the default JSDoc behaviour
+    assert_eq!(
+      parse_links(
+        "foo [Example (pre)]{@link https://example.com|Exapmle (after)} bar",
+        &render_ctx
+      ),
+      "foo [Example (pre)](https://example.com) bar"
+    );
     assert_eq!(
       parse_links(
         "foo {@linkcode https://example.com Example} bar",
@@ -592,6 +608,13 @@ mod test {
       ),
       "foo [`Example`](https://example.com) bar"
     );
+    assert_eq!(
+      parse_links(
+        "foo [Example]{@linkcode https://example.com} bar",
+        &render_ctx
+      ),
+      "foo [`Example`](https://example.com) bar"
+    );
 
     assert_eq!(
       parse_links("foo {@link unknownSymbol} bar", &render_ctx),

From 93232e36adb29e088165e18d720757d3ab1cb92c Mon Sep 17 00:00:00 2001
From: 0x009922 <43530070+0x009922@users.noreply.github.com>
Date: Wed, 19 Mar 2025 08:00:31 +0900
Subject: [PATCH 2/2] chore: typo

Signed-off-by: 0x009922 <43530070+0x009922@users.noreply.github.com>
---
 src/html/jsdoc.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/html/jsdoc.rs b/src/html/jsdoc.rs
index 51dd8fa2..8956e97f 100644
--- a/src/html/jsdoc.rs
+++ b/src/html/jsdoc.rs
@@ -596,7 +596,7 @@ mod test {
     // [label] takes precedence - consistent with the default JSDoc behaviour
     assert_eq!(
       parse_links(
-        "foo [Example (pre)]{@link https://example.com|Exapmle (after)} bar",
+        "foo [Example (pre)]{@link https://example.com|Example (after)} bar",
         &render_ctx
       ),
       "foo [Example (pre)](https://example.com) bar"