Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply typehints_formatter to signature #494

Merged
merged 3 commits into from
Oct 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion src/sphinx_autodoc_typehints/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,24 @@ def process_signature( # noqa: C901, PLR0913, PLR0917

obj = inspect.unwrap(obj)
sph_signature = sphinx_signature(obj, type_aliases=app.config["autodoc_type_aliases"])
typehints_formatter: Callable[..., str | None] | None = getattr(app.config, "typehints_formatter", None)

def _get_formatted_annotation(annotation: TypeVar) -> TypeVar:
if typehints_formatter is None:
return annotation
formatted_name = typehints_formatter(annotation)
return annotation if not isinstance(formatted_name, str) else TypeVar(formatted_name)

if app.config.typehints_use_signature_return:
sph_signature = sph_signature.replace(
return_annotation=_get_formatted_annotation(sph_signature.return_annotation)
)

if app.config.typehints_use_signature:
parameters = list(sph_signature.parameters.values())
parameters = [
param.replace(annotation=_get_formatted_annotation(param.annotation))
for param in sph_signature.parameters.values()
]
else:
parameters = [param.replace(annotation=inspect.Parameter.empty) for param in sph_signature.parameters.values()]

Expand Down
36 changes: 36 additions & 0 deletions tests/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -1385,6 +1385,42 @@ def has_doctest1() -> None:
"""


Unformatted = TypeVar("Unformatted")


@warns("cannot cache unpickable configuration value: 'typehints_formatter'")
gaborbernat marked this conversation as resolved.
Show resolved Hide resolved
@expected(
"""
mod.typehints_formatter_applied_to_signature(param: Formatted) -> Formatted

Do nothing

Parameters:
**param** (Formatted) -- A parameter

Return type:
Formatted

Returns:
The return value
""",
typehints_use_signature=True,
typehints_use_signature_return=True,
typehints_formatter=lambda _, __=None: "Formatted",
)
def typehints_formatter_applied_to_signature(param: Unformatted) -> Unformatted:
"""
Do nothing

Args:
param: A parameter

Returns:
The return value
"""
return param


# Config settings for each test run.
# Config Name: Sphinx Options as Dict.
configs = {
Expand Down