Skip to content

Commit 68cb72f

Browse files
committed
refactor: Use new autorefs syntax
1 parent 2299ab5 commit 68cb72f

File tree

9 files changed

+32
-29
lines changed

9 files changed

+32
-29
lines changed

docs/usage/configuration/docstrings.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ In that case, the Spacy tables can help.
208208

209209
**Type** | **Name** | **Description** | **Default**
210210
---------- | ----------- | ------------------------ | -----------
211-
<code><span data-autorefs-optional="list">list</span>[<span data-autorefs-optional="int">int</span> \| <span data-autorefs-optional="float">float</span>]</code> | `gravity_forces` | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. | *required*
212-
<code><span data-autorefs-optional="VacuumType">VacuumType</span> \| <span data-autorefs-optional="typing.Literal">Literal</span>["regular"]</code> | `vacuum_type` | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. | `VacuumType.PLASMA`
211+
<code><autoref identifier="list" optional>list</autoref>[<autoref identifier="int" optional>int</autoref> \| <autoref identifier="float" optional>float</autoref>]</code> | `gravity_forces` | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. | *required*
212+
<code><autoref identifier="VacuumType" optional>VacuumType</autoref> \| <autoref identifier="typing.Literal" optional>Literal</autoref>["regular"]</code> | `vacuum_type` | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. | `VacuumType.PLASMA`
213213
////
214214

215215
//// tab | List
@@ -222,8 +222,8 @@ Lists work well whatever the length of names, type annotations, descriptions, et
222222

223223
**Other Parameters:**
224224

225-
- `gravity_forces` (<code><span data-autorefs-optional="list">list</span>[<span data-autorefs-optional="int">int</span> \| <span data-autorefs-optional="float">float</span>]</code>) &mdash; Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
226-
- `vacuum_type` (<code><span data-autorefs-optional="VacuumType">VacuumType</span> \| <span data-autorefs-optional="typing.Literal">Literal</span>["regular"]</code>) &mdash; Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
225+
- `gravity_forces` (<code><autoref identifier="list" optional>list</autoref>[<autoref identifier="int" optional>int</autoref> \| <autoref identifier="float" optional>float</autoref>]</code>) &mdash; Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
226+
- `vacuum_type` (<code><autoref identifier="VacuumType" optional>VacuumType</autoref> \| <autoref identifier="typing.Literal" optional>Literal</autoref>["regular"]</code>) &mdash; Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
227227
////
228228

229229
//// tab | Spacy
@@ -241,8 +241,8 @@ by reserving more horizontal space on the second column.
241241

242242
**Name** | **Description**
243243
----------- | ---------------
244-
`gravity_forces` | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.<br>**TYPE:** <code><span data-autorefs-optional="list">list</span>[<span data-autorefs-optional="int">int</span> \| <span data-autorefs-optional="float">float</span>]</code> <span style="float: right;"><b>DEFAULT:</b> <i>required</i></span>
245-
`vacuum_type` | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.<br>**TYPE:**<code><span data-autorefs-optional="VacuumType">VacuumType</span> \| <span data-autorefs-optional="typing.Literal">Literal</span>["regular"]</code> <span style="float: right;"><b>DEFAULT:</b> <code>VacuumType.PLASMA</code></span>
244+
`gravity_forces` | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.<br>**TYPE:** <code><autoref identifier="list" optional>list</autoref>[<autoref identifier="int" optional>int</autoref> \| <autoref identifier="float" optional>float</autoref>]</code> <span style="float: right;"><b>DEFAULT:</b> <i>required</i></span>
245+
`vacuum_type` | Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.<br>**TYPE:**<code><autoref identifier="VacuumType" optional>VacuumType</autoref> \| <autoref identifier="typing.Literal" optional>Literal</autoref>["regular"]</code> <span style="float: right;"><b>DEFAULT:</b> <code>VacuumType.PLASMA</code></span>
246246
////
247247
///
248248

docs/usage/configuration/general.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def some_function():
139139

140140
## `preload_modules`
141141

142-
- **:octicons-package-24: Type <code><span data-autorefs-optional="list">list</span>[<span data-autorefs-optional="str">str</span>] | None</code> :material-equal: `None`{ title="default value" }**
142+
- **:octicons-package-24: Type <code><autoref identifier="list" optional>list</autoref>[<autoref identifier="str" optional>str</autoref>] | None</code> :material-equal: `None`{ title="default value" }**
143143
<!-- - **:octicons-project-template-24: Template :material-null:** (N/A) -->
144144

145145
Pre-load modules that are not specified directly in [autodoc instructions][autodoc syntax] (`::: identifier`).

docs/usage/configuration/members.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
## `members`
44

5-
- **:octicons-package-24: Type <code><span data-autorefs-optional="list">list</span>[<span data-autorefs-optional="str">str</span>] |
6-
<span data-autorefs-optional="bool">bool</span> | None</code> :material-equal: `None`{ title="default value" }**
5+
- **:octicons-package-24: Type <code><autoref identifier="list" optional>list</autoref>[<autoref identifier="str" optional>str</autoref>] |
6+
<autoref identifier="bool" optional>bool</autoref> | None</code> :material-equal: `None`{ title="default value" }**
77
<!-- - **:octicons-project-template-24: Template :material-null:** (N/A) -->
88

99
An explicit list of members to render.
@@ -97,8 +97,8 @@ INFO: **The default behavior (with unspecified `members` or `members: null`) is
9797

9898
## `inherited_members`
9999

100-
- **:octicons-package-24: Type <code><span data-autorefs-optional="list">list</span>[<span data-autorefs-optional="str">str</span>] |
101-
<span data-autorefs-optional="bool">bool</span></code> :material-equal: `False`{ title="default value" }**
100+
- **:octicons-package-24: Type <code><autoref identifier="list" optional>list</autoref>[<autoref identifier="str" optional>str</autoref>] |
101+
<autoref identifier="bool" optional>bool</autoref></code> :material-equal: `False`{ title="default value" }**
102102
<!-- - **:octicons-project-template-24: Template :material-null:** (N/A) -->
103103

104104
An explicit list of inherited members (for classes) to render.
@@ -331,7 +331,7 @@ def function_c():
331331

332332
## `filters`
333333

334-
- **:octicons-package-24: Type <code><span data-autorefs-optional="list">list</span>[<span data-autorefs-optional="str">str</span>] | None</code> :material-equal: `["!^_[^_]"]`{ title="default value" }**
334+
- **:octicons-package-24: Type <code><autoref identifier="list" optional>list</autoref>[<autoref identifier="str" optional>str</autoref>] | None</code> :material-equal: `["!^_[^_]"]`{ title="default value" }**
335335
<!-- - **:octicons-project-template-24: Template :material-null:** (N/A) -->
336336

337337
A list of filters applied to filter objects based on their name.
@@ -555,7 +555,7 @@ package
555555
[:octicons-heart-fill-24:{ .pulse } Sponsors only](../../insiders/index.md){ .insiders } &mdash;
556556
[:octicons-tag-24: Insiders 1.2.0](../../insiders/changelog.md#1.2.0)
557557

558-
- **:octicons-package-24: Type <code><span data-autorefs-optional="bool">bool</span> | <span data-autorefs-optional="dict">dict</span>[<span data-autorefs-optional="str">str</span>, <span data-autorefs-optional="bool">bool</span>]</code> :material-equal: `False`{ title="default value" }**
558+
- **:octicons-package-24: Type <code><autoref identifier="bool" optional>bool</autoref> | <autoref identifier="dict" optional>dict</autoref>[<autoref identifier="str" optional>str</autoref>, <autoref identifier="bool" optional>bool</autoref>]</code> :material-equal: `False`{ title="default value" }**
559559
<!-- - **:octicons-project-template-24: Template :material-null:** (N/A) -->
560560

561561
Whether to render summaries of modules, classes, functions (methods) and attributes.

src/mkdocstrings_handlers/python/rendering.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,10 @@ def do_crossref(path: str, *, brief: bool = True) -> Markup:
295295
full_path = path
296296
if brief:
297297
path = full_path.split(".")[-1]
298-
return Markup("<span data-autorefs-optional-hover={full_path}>{path}</span>").format(full_path=full_path, path=path)
298+
return Markup("<autoref identifier={full_path} optional hover>{path}</autoref>").format(
299+
full_path=full_path,
300+
path=path,
301+
)
299302

300303

301304
@lru_cache
@@ -327,7 +330,7 @@ def repl(match: Match) -> str:
327330
path = match.group()
328331
path_var = f"path{group_number}"
329332
variables[path_var] = path
330-
return f"<span data-autorefs-optional-hover={{{path_var}}}>{{{path_var}}}</span>"
333+
return f"<autoref identifier={{{path_var}}} optional hover>{{{path_var}}}</autoref>"
331334

332335
text = re.sub(r"([\w.]+)", repl, text)
333336
if code:

src/mkdocstrings_handlers/python/templates/material/_base/docstring/attributes.html.jinja

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Context:
3333
<tbody>
3434
{% for attribute in section.value %}
3535
<tr class="doc-section-item">
36-
<td><code><span data-autorefs-optional-hover="{{ obj.path }}.{{ attribute.name }}">{{ attribute.name }}</span></code></td>
36+
<td><code><autoref identifier="{{ obj.path }}.{{ attribute.name }}" optional hover>{{ attribute.name }}</autoref></code></td>
3737
<td>
3838
{% if attribute.annotation %}
3939
{% with expression = attribute.annotation %}
@@ -58,7 +58,7 @@ Context:
5858
<ul>
5959
{% for attribute in section.value %}
6060
<li class="doc-section-item field-body">
61-
<b><code><span data-autorefs-optional-hover="{{ obj.path }}.{{ attribute.name }}">{{ attribute.name }}</span></code></b>
61+
<b><code><autoref identifier="{{ obj.path }}.{{ attribute.name }}" optional hover>{{ attribute.name }}</autoref></code></b>
6262
{% if attribute.annotation %}
6363
{% with expression = attribute.annotation %}
6464
(<code>{% include "expression"|get_template with context %}</code>)
@@ -85,7 +85,7 @@ Context:
8585
<tbody>
8686
{% for attribute in section.value %}
8787
<tr class="doc-section-item">
88-
<td><code><span data-autorefs-optional-hover="{{ obj.path }}.{{ attribute.name }}">{{ attribute.name }}</span></code></td>
88+
<td><code><autoref identifier="{{ obj.path }}.{{ attribute.name }}" optional hover>{{ attribute.name }}</autoref></code></td>
8989
<td class="doc-attribute-details">
9090
<div class="doc-md-description">
9191
{{ attribute.description|convert_markdown(heading_level, html_id) }}

src/mkdocstrings_handlers/python/templates/material/_base/docstring/classes.html.jinja

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Context:
3232
<tbody>
3333
{% for class in section.value %}
3434
<tr class="doc-section-item">
35-
<td><code><span data-autorefs-optional-hover="{{ obj.path }}.{{ class.name }}">{{ class.name }}</span></code></td>
35+
<td><code><autoref identifier="{{ obj.path }}.{{ class.name }}" optional hover>{{ class.name }}</autoref></code></td>
3636
<td>
3737
<div class="doc-md-description">
3838
{{ class.description|convert_markdown(heading_level, html_id) }}
@@ -50,7 +50,7 @@ Context:
5050
<ul>
5151
{% for class in section.value %}
5252
<li class="doc-section-item field-body">
53-
<b><code><span data-autorefs-optional-hover="{{ obj.path }}.{{ class.name }}">{{ class.name }}</span></code></b>
53+
<b><code><autoref identifier="{{ obj.path }}.{{ class.name }}" optional hover>{{ class.name }}</autoref></code></b>
5454
5555
<div class="doc-md-description">
5656
{{ class.description|convert_markdown(heading_level, html_id) }}
@@ -72,7 +72,7 @@ Context:
7272
<tbody>
7373
{% for class in section.value %}
7474
<tr class="doc-section-item">
75-
<td><code><span data-autorefs-optional-hover="{{ obj.path }}.{{ class.name }}">{{ class.name }}</span></code></td>
75+
<td><code><autoref identifier="{{ obj.path }}.{{ class.name }}" optional hover>{{ class.name }}</autoref></code></td>
7676
<td class="doc-class-details">
7777
<div class="doc-md-description">
7878
{{ class.description|convert_markdown(heading_level, html_id) }}

src/mkdocstrings_handlers/python/templates/material/_base/docstring/functions.html.jinja

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Context:
3333
{% for function in section.value %}
3434
{% if not function.name == "__init__" or not config.merge_init_into_class %}
3535
<tr class="doc-section-item">
36-
<td><code><span data-autorefs-optional-hover="{{ obj.path }}.{{ function.name }}">{{ function.name }}</span></code></td>
36+
<td><code><autoref identifier="{{ obj.path }}.{{ function.name }}" optional hover>{{ function.name }}</autoref></code></td>
3737
<td>
3838
<div class="doc-md-description">
3939
{{ function.description|convert_markdown(heading_level, html_id) }}
@@ -53,7 +53,7 @@ Context:
5353
{% for function in section.value %}
5454
{% if not function.name == "__init__" or not config.merge_init_into_class %}
5555
<li class="doc-section-item field-body">
56-
<b><code><span data-autorefs-optional-hover="{{ obj.path }}.{{ function.name }}">{{ function.name }}</span></code></b>
56+
<b><code><autoref identifier="{{ obj.path }}.{{ function.name }}" optional hover>{{ function.name }}</autoref></code></b>
5757
5858
<div class="doc-md-description">
5959
{{ function.description|convert_markdown(heading_level, html_id) }}
@@ -77,7 +77,7 @@ Context:
7777
{% for function in section.value %}
7878
{% if not function.name == "__init__" or not config.merge_init_into_class %}
7979
<tr class="doc-section-item">
80-
<td><code><span data-autorefs-optional-hover="{{ obj.path }}.{{ function.name }}">{{ function.name }}</span></code></td>
80+
<td><code><autoref identifier="{{ obj.path }}.{{ function.name }}" optional hover>{{ function.name }}</autoref></code></td>
8181
<td class="doc-function-details">
8282
<div class="doc-md-description">
8383
{{ function.description|convert_markdown(heading_level, html_id) }}

src/mkdocstrings_handlers/python/templates/material/_base/docstring/modules.html.jinja

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Context:
3232
<tbody>
3333
{% for module in section.value %}
3434
<tr class="doc-section-item">
35-
<td><code><span data-autorefs-optional-hover="{{ obj.path }}.{{ module.name }}">{{ module.name }}</span></code></td>
35+
<td><code><autoref identifier="{{ obj.path }}.{{ module.name }}" optional hover>{{ module.name }}</autoref></code></td>
3636
<td>
3737
<div class="doc-md-description">
3838
{{ module.description|convert_markdown(heading_level, html_id) }}
@@ -50,7 +50,7 @@ Context:
5050
<ul>
5151
{% for module in section.value %}
5252
<li class="doc-section-item field-body">
53-
<b><code><span data-autorefs-optional-hover="{{ obj.path }}.{{ module.name }}">{{ module.name }}</span></code></b>
53+
<b><code><autoref identifier="{{ obj.path }}.{{ module.name }}" optional hover>{{ module.name }}</autoref></code></b>
5454
5555
<div class="doc-md-description">
5656
{{ module.description|convert_markdown(heading_level, html_id) }}
@@ -72,7 +72,7 @@ Context:
7272
<tbody>
7373
{% for module in section.value %}
7474
<tr class="doc-section-item">
75-
<td><code><span data-autorefs-optional-hover="{{ obj.path }}.{{ module.name }}">{{ module.name }}</span></code></td>
75+
<td><code><autoref identifier="{{ obj.path }}.{{ module.name }}" optional hover>{{ module.name }}</autoref></code></td>
7676
<td class="doc-module-details">
7777
<div class="doc-md-description">
7878
{{ module.description|convert_markdown(heading_level, html_id) }}

0 commit comments

Comments
 (0)