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

Show file tree
Hide file tree
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 more tests
  • Loading branch information
@mschoettle
mschoettle committed May 7, 2024
commit 37ee83368c60e56302c0a4f9f0ec7091db41b4a9
1 change: 1 addition & 0 deletions mypy/fastparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,6 +986,7 @@ def do_func_def(
# Determine end of the function definition itself
# Fall back to the end of the function definition including its body
def_end_line: int | None = n.lineno
# TODO: to go to the end of the function name: n.col_offset + 4 + len(n.name)
def_end_column: int | None = n.col_offset

returns = n.returns
Expand Down
4 changes: 3 additions & 1 deletion mypy/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,9 @@ def span_from_context(ctx: Context) -> Iterable[int]:
if isinstance(context, FuncDef):
end_line = context.def_end_line
# column is 1-based, see also format_messages in errors.py
end_column = context.def_end_column + 1 if context.def_end_column else end_column
end_column = (
context.def_end_column + 1 if context.def_end_column is not None else end_column
)

self.errors.report(
context.line if context else -1,
Expand Down
36 changes: 30 additions & 6 deletions test-data/unit/check-columns.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,22 +178,46 @@ if int():
def g(x): # E:5: Function is missing a type annotation
pass

[case testPrettyFunctionMissingTypeAnnotation]
# flags: --disallow-untyped-defs --pretty
def function_with_long_name():
pass
[out]
main:2:1: error: Function is missing a return type annotation
def function_with_long_name():
^
main:2:1: note: Use "-> None" if function does not return a value

[case testColumnEndFunctionMissingTypeAnnotation]
# flags: --disallow-untyped-defs --show-error-end
from typing import Any, Optional
if int():
def f(x: int, foo: Optional[str]):
def f():
pass

def f_no_return(x: int, foo: Optional[str]):
pass

def f_default(x: int, foo: Optional[str] = None):
pass

def f_default_untyped(x, foo = None):
pass

def g(x: int, foo: Optional[str] = None):
def f_args(x, *args):
pass

def h(x, foo = None):
def f_kwargs(x, *args, **kwargs):
pass
[builtins fixtures/tuple.pyi]
[out]
main:4:5:4:37: error: Function is missing a return type annotation
main:7:5:7:44: error: Function is missing a return type annotation
main:10:5:10:24: error: Function is missing a type annotation
main:4:5:4:5: error: Function is missing a return type annotation
main:4:5:4:5: note: Use "-> None" if function does not return a value
main:7:5:7:47: error: Function is missing a return type annotation
main:10:5:10:52: error: Function is missing a return type annotation
main:13:5:13:40: error: Function is missing a type annotation
main:16:5:16:24: error: Function is missing a type annotation
main:19:5:19:36: error: Function is missing a type annotation

[case testColumnNameIsNotDefined]
((x)) # E:3: Name "x" is not defined
Expand Down