Merge branch 'main' into backlinks

Author: pawamoy

Diff for: CHANGELOG.md

@@ -5,6 +5,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 <!-- insertion marker -->
+## [1.3.1](https://github.com/mkdocstrings/autorefs/releases/tag/1.3.1) - 2025-02-11
+
+<small>[Compare with 1.3.0](https://github.com/mkdocstrings/autorefs/compare/1.3.0...1.3.1)</small>
+
+### Bug Fixes
+
+- Always resolve secondary URLs to closest (don't log warnings) ([243ad35](https://github.com/mkdocstrings/autorefs/commit/243ad35f193b48216b531333e0d91ab2fa0a0db4) by Timothée Mazzucotelli). [Issue-52](https://github.com/mkdocstrings/autorefs/issues/52)
+
 ## [1.3.0](https://github.com/mkdocstrings/autorefs/releases/tag/1.3.0) - 2025-01-12
 
 <small>[Compare with 1.2.0](https://github.com/mkdocstrings/autorefs/compare/1.2.0...1.3.0)</small>

Diff for: src/mkdocs_autorefs/plugin.py

@@ -300,7 +300,7 @@ def _get_item_url(
             raise
 
         if len(urls) > 1:
-            if self.config.resolve_closest and from_url is not None:
+            if (self.config.resolve_closest or qualifier == "secondary") and from_url is not None:
                 return self._get_closest_url(from_url, urls, qualifier)
             log.warning(
                 "Multiple %s URLs found for '%s': %s. "

Diff for: tests/test_plugin.py

@@ -94,26 +94,30 @@ def test_register_secondary_url() -> None:
     assert plugin._secondary_url_map == {"foo": {"foo.html#foo": None}}
 
 
-def test_warn_multiple_urls(caplog: pytest.LogCaptureFixture) -> None:
+@pytest.mark.parametrize("primary", [True, False])
+def test_warn_multiple_urls(caplog: pytest.LogCaptureFixture, primary: bool) -> None:
     """Warn when multiple URLs are found for the same identifier."""
     plugin = AutorefsPlugin()
     plugin.config = AutorefsConfig()
-    plugin.register_anchor(identifier="foo", page="foo.html", primary=True)
-    plugin.register_anchor(identifier="foo", page="bar.html", primary=True)
+    plugin.register_anchor(identifier="foo", page="foo.html", primary=primary)
+    plugin.register_anchor(identifier="foo", page="bar.html", primary=primary)
     url_mapper = functools.partial(plugin.get_item_url, from_url="/hello")
     # YORE: Bump 2: Replace `, _legacy_refs=False` with `` within line.
     fix_refs('<autoref identifier="foo">Foo</autoref>', url_mapper, _legacy_refs=False)
-    assert "Multiple primary URLs found for 'foo': ['foo.html#foo', 'bar.html#foo']" in caplog.text
+    qualifier = "primary" if primary else "secondary"
+    assert (f"Multiple {qualifier} URLs found for 'foo': ['foo.html#foo', 'bar.html#foo']" in caplog.text) is primary
 
 
-def test_use_closest_url(caplog: pytest.LogCaptureFixture) -> None:
+@pytest.mark.parametrize("primary", [True, False])
+def test_use_closest_url(caplog: pytest.LogCaptureFixture, primary: bool) -> None:
     """Use the closest URL when multiple URLs are found for the same identifier."""
     plugin = AutorefsPlugin()
     plugin.config = AutorefsConfig()
     plugin.config.resolve_closest = True
-    plugin.register_anchor(identifier="foo", page="foo.html", primary=True)
-    plugin.register_anchor(identifier="foo", page="bar.html", primary=True)
+    plugin.register_anchor(identifier="foo", page="foo.html", primary=primary)
+    plugin.register_anchor(identifier="foo", page="bar.html", primary=primary)
     url_mapper = functools.partial(plugin.get_item_url, from_url="/hello")
     # YORE: Bump 2: Replace `, _legacy_refs=False` with `` within line.
     fix_refs('<autoref identifier="foo">Foo</autoref>', url_mapper, _legacy_refs=False)
-    assert "Multiple primary URLs found for 'foo': ['foo.html#foo', 'bar.html#foo']" not in caplog.text
+    qualifier = "primary" if primary else "secondary"
+    assert f"Multiple {qualifier} URLs found for 'foo': ['foo.html#foo', 'bar.html#foo']" not in caplog.text