Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Change end line and column for untyped function defs to line of function definition #17006

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

Open
mschoettle wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Change end line and column for untyped function defs to line of function definition #17006

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5f88e5d
Add test for line and column end for missing function type annotation
mschoettle Mar 9, 2024
c780ac1
Change end of line and column to be same as start of node
mschoettle Mar 9, 2024
707e4aa
Merge branch 'python:master' into untyped-def-end-line
mschoettle May 6, 2024
8b7802c
Add end line and column for the function definition itself
mschoettle May 6, 2024
6dee499
Determine end line and column of function itself
mschoettle May 6, 2024
37ee833
Add more tests
mschoettle May 7, 2024
081c8cb
Add extra test case
mschoettle May 7, 2024
b835494
Cleanup
mschoettle May 8, 2024
5a7c0ec
Add multiline test
mschoettle May 9, 2024
38f311a
Merge branch 'master' into untyped-def-end-line
JelleZijlstra Jun 2, 2024
796d6ee
Merge branch 'master' into untyped-def-end-line
mschoettle Sep 9, 2024
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
Prev Previous commit
Next Next commit
Add end line and column for the function definition itself
  • Loading branch information
@mschoettle
mschoettle committed May 6, 2024
commit 8b7802ca49ea347e86e0cf21f63fcb999c351e8c
5 changes: 5 additions & 0 deletions mypy/nodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,8 @@ class FuncDef(FuncItem, SymbolNode, Statement):
# Present only when a function is decorated with @typing.datasclass_transform or similar
"dataclass_transform_spec",
"docstring",
"def_end_line",
"def_end_column",
)

__match_args__ = ("name", "arguments", "type", "body")
Expand Down Expand Up @@ -778,6 +780,9 @@ def __init__(
self.is_mypy_only = False
self.dataclass_transform_spec: DataclassTransformSpec | None = None
self.docstring: str | None = None
# track the end of the function definition itself
self.def_end_line: int | None = None
self.def_end_column: int | None = None
Copy link
Copy Markdown
Member

@JelleZijlstra JelleZijlstra May 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the new attributes will also need to be serialized, or they may get lost in incremental mode.

Copy link
Copy Markdown
Author

@mschoettle mschoettle May 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked in nodes.py and no node serializes end_line or end_column. The same for line and column with the exception of the TypeAlias node (it's unclear to me why).

I did a quick test invoking mypy with --incremental --disallow-untyped-defs --show-error-end on the same file twice which resulted in consistent results.


@property
def name(self) -> str:
Expand Down