fixup! feat: Add option to scan and register HTML anchors

src/mkdocs_autorefs/plugin.py

@@ -15,7 +15,6 @@
 import contextlib
 import functools
 import logging
-from functools import partial
 from typing import TYPE_CHECKING, Any, Callable, Sequence
 from urllib.parse import urlsplit
 
@@ -25,7 +24,7 @@
 from mkdocs.plugins import BasePlugin
 from mkdocs.structure.pages import Page
 
-from mkdocs_autorefs.references import AnchorScannerTreeProcessor, AutorefsExtension, fix_refs, relative_url
+from mkdocs_autorefs.references import AutorefsExtension, fix_refs, relative_url
 
 if TYPE_CHECKING:
     from mkdocs.config.defaults import MkDocsConfig
@@ -147,8 +146,7 @@ def on_config(self, config: MkDocsConfig) -> MkDocsConfig | None:
         """
         log.debug("Adding AutorefsExtension to the list")
         scan_anchors = self.scan_anchors or self.config.scan_anchors
-        anchor_scanner_factory = partial(AnchorScannerTreeProcessor, self) if scan_anchors else None
-        config["markdown_extensions"].append(AutorefsExtension(anchor_scanner_factory))
+        config["markdown_extensions"].append(AutorefsExtension(plugin=self if scan_anchors else None))
         return config
 
     def on_page_markdown(self, markdown: str, page: Page, **kwargs: Any) -> str:  # noqa: ARG002

src/mkdocs_autorefs/references.py

@@ -246,7 +246,7 @@ class AutorefsExtension(Extension):
 
     def __init__(
         self,
-        anchor_scanner_factory: Callable[[Markdown], AnchorScannerTreeProcessor] | None = None,
+        plugin: AutorefsPlugin | None = None,
         **kwargs: Any,
     ) -> None:
         """Initialize the Markdown extension.
@@ -256,7 +256,7 @@ def __init__(
             **kwargs: Keyword arguments passed to the [base constructor][markdown.extensions.Extension].
         """
         super().__init__(**kwargs)
-        self.anchor_scanner_factory = anchor_scanner_factory
+        self.plugin = plugin
 
     def extendMarkdown(self, md: Markdown) -> None:  # noqa: N802 (casing: parent method's name)
         """Register the extension.
@@ -271,9 +271,9 @@ def extendMarkdown(self, md: Markdown) -> None:  # noqa: N802 (casing: parent me
             "mkdocs-autorefs",
             priority=168,  # Right after markdown.inlinepatterns.ReferenceInlineProcessor
         )
-        if self.anchor_scanner_factory:
+        if self.plugin:
             md.treeprocessors.register(
-                self.anchor_scanner_factory(md),
+                AnchorScannerTreeProcessor(self.plugin, md),
                 "mkdocs-autorefs-anchors-scanner",
                 priority=0,
             )

tests/test_references.py

@@ -2,14 +2,13 @@
 
 from __future__ import annotations
 
-from functools import partial
 from textwrap import dedent
 
 import markdown
 import pytest
 
 from mkdocs_autorefs.plugin import AutorefsPlugin
-from mkdocs_autorefs.references import AnchorScannerTreeProcessor, AutorefsExtension, fix_refs, relative_url
+from mkdocs_autorefs.references import AutorefsExtension, fix_refs, relative_url
 
 
 @pytest.mark.parametrize(
@@ -233,7 +232,7 @@ def test_external_references() -> None:
 def test_register_html_anchors() -> None:
     """Check that HTML anchors are registered when enabled."""
     plugin = AutorefsPlugin()
-    md = markdown.Markdown(extensions=["attr_list", AutorefsExtension(partial(AnchorScannerTreeProcessor, plugin))])
+    md = markdown.Markdown(extensions=["attr_list", AutorefsExtension(plugin)])
     plugin.current_page = ""
     md.convert(
         dedent(