Skip to content

gh-133710: Enhance pyrepl auto-indent #140710

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
tanloong wants to merge 11 commits into
base: main
Choose a base branch
from
+76 −17
Open

gh-133710: Enhance pyrepl auto-indent #140710

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6e80edb
Refactor `_should_auto_indent()`
tanloong May 8, 2025
e4ef49d
Add tests
tanloong May 8, 2025
2113f88
Don't indent if cursor line is already indented
tanloong May 9, 2025
dee8302
Add test
tanloong May 9, 2025
7a332a4
Merge branch 'main' into enhance-pyrepl-indent
tanloong Oct 28, 2025
be762c5
Add test_dont_indent_already_indented
tanloong Oct 28, 2025
20603d3
blurb
tanloong Oct 28, 2025
df35507
fix Sphinx syntax error
tanloong Oct 28, 2025
fb7adc5
reuse _pyrepl.utils.gen_colors to determine whether to indent
tanloong Jan 12, 2026
106aa66
revert unrelated changes
tanloong Jan 13, 2026
7f115cd
Merge branch 'main' into enhance-pyrepl-indent
tanloong Jan 14, 2026
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
Refactor _should_auto_indent()
  • Loading branch information
@tanloong
tanloong committed May 9, 2025
commit 6e80edb1f3f7b89c77f6b9f26cb6fba252d0592d
44 changes: 31 additions & 13 deletions Lib/_pyrepl/readline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,19 +254,37 @@ def _should_auto_indent(buffer: list[str], pos: int) -> bool:
# check if last character before "pos" is a colon, ignoring
# whitespaces and comments.
last_char = None
while pos > 0:
pos -= 1
if last_char is None:
if buffer[pos] not in " \t\n#": # ignore whitespaces and comments
last_char = buffer[pos]
else:
# even if we found a non-whitespace character before
# original pos, we keep going back until newline is reached
# to make sure we ignore comments
if buffer[pos] == "\n":
break
if buffer[pos] == "#":
last_char = None
# A stack to keep track of string delimiters (quotes). Push a quote when
# entering a string, and pop it when the string ends. When the stack is
# empty, we're not inside a string. If encounter a '#' while not inside a
# string, it's a comment start; otherwise, it's just a '#' character within
# a string.
in_string: list[str] = []
in_comment = False
i = -1
while i < pos - 1:
i += 1
char = buffer[i]

# update last_char
if char == "#":
if in_string:
last_char = char # '#' inside a string is just a character
else:
in_comment = True
elif char == "\n":
# newline ends a comment
in_comment = False
elif char not in " \t" and not in_comment and not in_string:
# update last_char with non-whitespace chars outside comments and strings
last_char = char

# update stack
if char in "\"'" and (i == 0 or buffer[i - 1] != "\\"):
if in_string and in_string[-1] == char:
in_string.pop()
else:
in_string.append(char)
return last_char == ":"


Expand Down