gh-122237: Fix repl auto indentation wrong with comments by AnsonTrapani · Pull Request #122383 · python/cpython · GitHub
Skip to content

gh-122237: Fix repl auto indentation wrong with comments #122383

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

Closed
AnsonTrapani wants to merge 5 commits into from
+99 −1
Closed

gh-122237: Fix repl auto indentation wrong with comments #122383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
072b3db
fixed auto indentation size for lines with comments
AnsonTrapani Jul 29, 2024
cf7a627
Added test for the indentation of repl input with comments
AnsonTrapani Jul 29, 2024
852ed7b
Merge branch 'main' into fix-repl-auto-indentation-wrong-with-comments
AnsonTrapani Jul 29, 2024
ae1455a
📜🤖 Added by blurb_it.
blurb-it[bot] Jul 29, 2024
d9bffaa
Merge branch 'main' into fix-repl-auto-indentation-wrong-with-comments
AnsonTrapani Jul 29, 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
4 changes: 3 additions & 1 deletion Lib/_pyrepl/readline.py
View file
Open in desktop
69 changes: 69 additions & 0 deletions Lib/test/test_pyrepl/test_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,75 @@ def test_newline_within_block_trailing_whitespace(self):
self.assert_screen_equals(reader, expected)
self.assertTrue(reader.finished)

def test_single_comment_character_after_colon(self):
code = (
"def foo(): #"
)
events = itertools.chain(
code_to_events(code),
[
# go to the end of the first line
Event(evt="key", data="up", raw=bytearray(b"\x1bOA")),
Event(evt="key", data="\x05", raw=bytearray(b"\x1bO5")),
# new line after single comment character
Event(evt="key", data="\n", raw=bytearray(b"\n")),
# go to end of second line
Event(evt="key", data="down", raw=bytearray(b"\x1bOB")),
Event(evt="key", data="\x05", raw=bytearray(b"\x1bO5")),
# write an "a"
Event(evt="key", data="a", raw=bytearray(b"a"))
],
)
no_paste_reader = functools.partial(prepare_reader, paste_mode=False)
reader, _ = handle_all_events(events, prepare_reader=no_paste_reader)
expected = (
"def foo(): #\n"
" a"
)
self.assert_screen_equals(reader, expected)

def test_no_code_only_comment_on_single_line(self):
code = (
"def foo():"
)
events = itertools.chain(
code_to_events(code),
[
# go to the end of the first line
Event(evt="key", data="up", raw=bytearray(b"\x1bOA")),
Event(evt="key", data="\x05", raw=bytearray(b"\x1bO5")),
# new line at end of first line and write "# foo" on next line
Event(evt="key", data="\n", raw=bytearray(b"\n")),
Event(evt="key", data="#", raw=bytearray(b"#")),
Event(evt="key", data=" ", raw=bytearray(b" ")),
Event(evt="key", data="f", raw=bytearray(b"f")),
Event(evt="key", data="o", raw=bytearray(b"o")),
Event(evt="key", data="o", raw=bytearray(b"o")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
# go to end of second line
Event(evt="key", data="down", raw=bytearray(b"\x1bOB")),
Event(evt="key", data="\x05", raw=bytearray(b"\x1bO5")),
# write an "a"
Event(evt="key", data="a", raw=bytearray(b"a")),
Event(evt="key", data=" ", raw=bytearray(b" ")),
Event(evt="key", data="#", raw=bytearray(b"#")),
Event(evt="key", data=" ", raw=bytearray(b" ")),
Event(evt="key", data="f", raw=bytearray(b"f")),
Event(evt="key", data="o", raw=bytearray(b"o")),
Event(evt="key", data="o", raw=bytearray(b"o")),
Event(evt="key", data="\n", raw=bytearray(b"\n")),
],
)
no_paste_reader = functools.partial(prepare_reader, paste_mode=False)
reader, _ = handle_all_events(events, prepare_reader=no_paste_reader)
expected = (
"def foo():\n"
" # foo\n"
" a # foo\n"
" "
)
self.assert_screen_equals(reader, expected)

def test_input_hook_is_called_if_set(self):
input_hook = MagicMock()
def _prepare_console(events):
Expand Down
27 changes: 27 additions & 0 deletions Misc/NEWS.d/next/Library/2024-07-29-06-42-01.gh-issue-122237.7w1yfJ.rst
View file
Open in desktop