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

Skip to content

Shorter reporting (i.e. don't highlight entire functions for certain errors) #17203

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

Draft
shaperilio wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Shorter reporting (i.e. don't highlight entire functions for certain errors) #17203

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10c391b
Compute `end_line` and `end_column` for `FuncDef` so they don't inclu…
shaperilio Jan 6, 2024
618440a
Report end line and column in `SemanticAnalyzer`
shaperilio Jan 6, 2024
070becb
Revert "Compute `end_line` and `end_column` for `FuncDef` so they don…
shaperilio Jan 6, 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
Next Next commit
Compute end_line and end_column for FuncDef so they don't inclu… 
…de the body
  • Loading branch information
@shaperilio
shaperilio committed Jan 6, 2024
commit 10c391bdbb39209210e00a0d174754e8322be056
42 changes: 39 additions & 3 deletions mypy/fastparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,9 +985,45 @@ def do_func_def(
_dummy_fallback,
)

# End position is always the same.
end_line = getattr(n, "end_lineno", None)
end_column = getattr(n, "end_col_offset", None)
# We don't want the end positions for functions to include the entire
# body, which is what `ast` gives us; we want to highlight only the
# function signature as the error / note.

# First, check for return typehint
ret = n.returns
if ret is not None:
# There is a return typehint; highlight to the end of it.
end_line = ret.end_lineno
end_column = ret.end_col_offset
elif len(n.body) > 0:
# There's no return type, but there is a body (which includes
# docstrings).
def_line = n.lineno
body_line = n.body[0].lineno
if def_line == body_line:
# Single line definition, e.g. `def foo(): pass`
# NOTE: this will not highlight the colon in the nonstandard
# case of `def foo():pass`
end_line = def_line
end_column = n.body[0].col_offset - 1
else:
# "Proper" body starting on a different line after `:`
# We highlight up to the line in which the body starts
# but at column 0, effectively ending at the end of the
# previous line.
# NOTE: this causes funny highlighting in the non-standard
# case below:
#
# def foo(x: int
# ): pass
#
# The error will show from `d` of `def to `t` of `int`.
end_line = n.body[0].lineno
end_column = 0
else:
# Fall back to whole function.
end_line = getattr(n, "end_lineno", None)
end_column = getattr(n, "end_col_offset", None)

self.class_and_function_stack.pop()
self.class_and_function_stack.append("F")
Expand Down