Skip to content

Fix normalizeSelection for Python < 3.8 #18279

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
kimadeline merged 2 commits into from
Jan 13, 2022
Merged

Fix normalizeSelection for Python < 3.8 #18279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf950ec
Fix normalizeSelection for Python < 3.8
kimadeline Jan 13, 2022
98f931f
>= 3.8 instead of > 3.7
kimadeline Jan 13, 2022
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
1 change: 1 addition & 0 deletions news/2 Fixes/18258.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix "Run Selection/Line in Python Terminal" for Python < 3.8 when the code includes decorators.
8 changes: 4 additions & 4 deletions pythonFiles/normalizeSelection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ def _get_statements(selection):
for node in tree.body[1:]:
line_end = node.lineno - 1
# Special handling of decorators:
# In Python 3, decorators are not taken into account in the value returned by lineno,
# In Python 3.8 and higher, decorators are not taken into account in the value returned by lineno,
# and we have to use the length of the decorator_list array to compute the actual start line.
# In Python 2.7, lineno takes into account decorators, so this offset check is unnecessary.
# Before that, lineno takes into account decorators, so this offset check is unnecessary.
# Also, not all AST objects can have decorators.
if hasattr(node, "decorator_list") and sys.version_info.major >= 3:
if hasattr(node, "decorator_list") and sys.version_info >= (3, 8):
# Using getattr instead of node.decorator_list or pyright will complain about an unknown member.
line_end -= len(getattr(node, "decorator_list"))
ends.append(line_end)
Expand All @@ -71,7 +71,7 @@ def _get_statements(selection):
start = node.lineno - 1

# Special handling of decorators similar to what's above.
if hasattr(node, "decorator_list") and sys.version_info.major >= 3:
if hasattr(node, "decorator_list") and sys.version_info >= (3, 8):
# Using getattr instead of node.decorator_list or pyright will complain about an unknown member.
start -= len(getattr(node, "decorator_list"))
block = "\n".join(lines[start:end])
Expand Down