Merge pull request #206 from daizutabi/205-correct-link-title

Correct link title
daizutabi · Sep 23, 2024 · 13bac09 · 13bac09
2 parents 8279d34 + f92d221
commit 13bac09
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/mkapi/css/mkapi-common.css b/src/mkapi/css/mkapi-common.css
@@ -136,14 +136,15 @@ ul.mkapi-item-list {
 .mkapi-object-link {
   font-size: 0.85em;
   margin-left: 1.2em;
-  vertical-align: baseline;
 }
 
 .mkapi-document-toggle,
 .mkapi-parent-toggle,
-.mkapi-section-toggle {
+.mkapi-section-toggle,
+.mkapi-definition-link {
   cursor: pointer;
   color: var(--mkapi-punctuation-color);
+  font-size: 0.85em;
 }
 
 .mkapi-document-toggle:hover,

diff --git a/src/mkapi/page.py b/src/mkapi/page.py
@@ -176,6 +176,7 @@ def _link(match: re.Match, src_uri: str, namespace: str) -> str:
     asname = ""
 
     if m := OBJECT_LINK_PATTERN.match(fullname):
+        is_object_link = True
         namespace, fullname = m.groups()
 
         if namespace == "definition" and "object" in URIS:
@@ -188,6 +189,7 @@ def _link(match: re.Match, src_uri: str, namespace: str) -> str:
             return ""
 
     else:
+        is_object_link = False
         asname = match.group()
 
     if fullname.startswith("__mkapi__."):
@@ -199,7 +201,7 @@ def _link(match: re.Match, src_uri: str, namespace: str) -> str:
     if uri := URIS[namespace].get(fullname):
         uri = os.path.relpath(uri, PurePath(src_uri).parent)
         uri = uri.replace("\\", "/")  # Normalize for Windows
-        title = ANCHOR_TITLES[namespace]
+        title = ANCHOR_TITLES[namespace] if is_object_link else fullname
         return f'[{name}]({uri}#{fullname} "{title}")'
 
     if from_mkapi and name != ANCHOR_PLACEHOLDERS["definition"]:

diff --git a/tests/test_page.py b/tests/test_page.py
@@ -144,7 +144,7 @@ def test_link_not_from_mkapi():
     m = LINK_PATTERN.match("[A][x.y]")
     assert m
     m = _link(m, "y/a.md", "definition")
-    assert m == '[A](../z/a/c.md#x.y "Go to definition")'
+    assert m == '[A](../z/a/c.md#x.y "x.y")'
 
 
 def test_link_not_from_mkapi_invalid():
@@ -164,7 +164,7 @@ def test_link_backticks():
     m = LINK_PATTERN.match("[`A`][x.y]")
     assert m
     m = _link(m, "q/r/a.md", "source")
-    assert m == '[`A`](../../p/B.md#x.y "Go to source")'
+    assert m == '[`A`](../../p/B.md#x.y "x.y")'
 
 
 def test_link_without_fullname():
@@ -174,7 +174,7 @@ def test_link_without_fullname():
     m = LINK_PATTERN.match("[x.y][]")
     assert m
     m = _link(m, "q/r/a.md", "object")
-    assert m == '[x.y](a.md#x.y "Go to docs")'
+    assert m == '[x.y](a.md#x.y "x.y")'
 
 
 def test_link_without_fullname_backticks():
@@ -184,7 +184,7 @@ def test_link_without_fullname_backticks():
     m = LINK_PATTERN.match("[`x.y`][]")
     assert m
     m = _link(m, "q/r/a.md", "source")
-    assert m == '[`x.y`](../s/a.md#x.y "Go to source")'
+    assert m == '[`x.y`](../s/a.md#x.y "x.y")'
 
 
 def test_page_convert_object_page():