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
Change end of line and column to be same as start of node
  • Loading branch information
@mschoettle
mschoettle committed Mar 9, 2024
commit c780ac1e8766ed84b665efe59aa530a11a9dcccd
3 changes: 3 additions & 0 deletions mypy/checker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,6 +1493,9 @@ def is_unannotated_any(t: Type) -> bool:
show_untyped = not self.is_typeshed_stub or self.options.warn_incomplete_stub
check_incomplete_defs = self.options.disallow_incomplete_defs and has_explicit_annotation
if show_untyped and (self.options.disallow_untyped_defs or check_incomplete_defs):
# TODO: changing end line and column here changes this information for the node itself
# fdef.end_line = fdef.line
# fdef.end_column = fdef.column + 1
if fdef.type is None and self.options.disallow_untyped_defs:
if not fdef.arguments or (
len(fdef.arguments) == 1
Expand Down
18 changes: 15 additions & 3 deletions mypy/messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,16 +256,28 @@ def span_from_context(ctx: Context) -> Iterable[int]:
assert origin_span is not None
origin_span = itertools.chain(origin_span, span_from_context(secondary_context))

column = context.column if context else -1
end_line = context.end_line if context else -1
end_column = context.end_column if context else -1

# set end line and column to same as start of context for function definitions
# this avoids errors being reported in IDEs for the whole function
# TODO: figure out if it's possible to find the end of the function definition line
Copy link
Copy Markdown
Member

@JelleZijlstra JelleZijlstra Apr 30, 2024

Choose a reason for hiding this comment

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

One approach for this could be to add a new attribute to the FuncDef class and set it when we're creating the FuncDef object in fastparse.py.

if isinstance(context, FuncDef):
end_line = context.line
# column is 1-based, see also format_messages in errors.py
end_column = column + 1

self.errors.report(
context.line if context else -1,
context.column if context else -1,
column,
msg,
severity=severity,
file=file,
offset=offset,
origin_span=origin_span,
end_line=context.end_line if context else -1,
end_column=context.end_column if context else -1,
end_line=end_line,
end_column=end_column,
code=code,
allow_dups=allow_dups,
)
Expand Down
4 changes: 2 additions & 2 deletions test-data/unit/check-columns.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ if int():
def g(x):
pass
[out]
main:3:5:3:15: error: Function is missing a return type annotation
main:6:5:6:10: error: Function is missing a type annotation
main:3:5:3:5: error: Function is missing a return type annotation
main:6:5:6:5: error: Function is missing a type annotation

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