Skip to content

Simplify span_from_context #20489

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.

Sign up for GitHub

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

Merged
hauntsaninja merged 2 commits into from
Dec 30, 2025
Merged

Simplify span_from_context #20489

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7d6d1d
Simplify span_from_context
hauntsaninja Dec 30, 2025
0e6257c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 30, 2025
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: 3 additions & 14 deletions mypy/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
SYMBOL_FUNCBASE_TYPES,
ArgKind,
CallExpr,
ClassDef,
Context,
Expression,
FuncDef,
Expand Down Expand Up @@ -250,20 +249,10 @@ def report(
"""

def span_from_context(ctx: Context) -> Iterable[int]:
"""This determines where a type: ignore for a given context has effect.

Current logic is a bit tricky, to keep as much backwards compatibility as
possible. We may reconsider this to always be a single line (or otherwise
simplify it) when we drop Python 3.7.

TODO: address this in follow up PR
"""
if isinstance(ctx, (ClassDef, FuncDef)):
"""This determines where a type: ignore for a given context has effect."""
if not isinstance(ctx, Expression):
return range(ctx.line, ctx.line + 1)
elif not isinstance(ctx, Expression):
return [ctx.line]
else:
return range(ctx.line, (ctx.end_line or ctx.line) + 1)
return range(ctx.line, (ctx.end_line or ctx.line) + 1)

origin_span: Iterable[int] | None
if origin is not None:
Expand Down