Skip to content

gh-118878: Pyrepl: show completions menu below the current line #118939

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
pablogsal merged 16 commits into from
Jan 21, 2025
Merged

gh-118878: Pyrepl: show completions menu below the current line #118939

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
dc98b55
gh-118877: Fix AssertionError crash in pyrepl
danielhollas May 10, 2024
eae92aa
gh-118878: pyrepl: Show completion menu below current line
danielhollas May 11, 2024
9e2170c
WIP: Add test
danielhollas May 12, 2024
da921c1
Revert "WIP: Add test"
danielhollas May 22, 2024
dd90c2e
Merge branch 'main' into pyrepl/completions-below
danielhollas May 22, 2024
4498c29
Add test
danielhollas May 22, 2024
14805a8
Fix test
danielhollas May 22, 2024
119c01d
Get rid of spurious output in test_interact.py
danielhollas May 22, 2024
c5407d5
Merge branch 'main' into pyrepl/completions-below
danielhollas May 31, 2024
af90634
Merge branch 'main' into pyrepl/completions-below
danielhollas Jun 24, 2024
d150136
Fix test
danielhollas Jun 24, 2024
f7f346a
Merge branch 'main' into pyrepl/completions-below
danielhollas Jul 14, 2024
ce0641d
Add blurb
danielhollas Jul 14, 2024
aa9a3a3
Remove test
danielhollas Jul 14, 2024
c686ce2
Merge branch 'main' into pyrepl/completions-below
danielhollas Sep 8, 2024
8feaaca
Merge branch 'main' into pyrepl/completions-below
pablogsal Jan 21, 2025
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
gh-118878: pyrepl: Show completion menu below current line 
The main advantage of this is that the behaviour is less janky,
since the current line no longer jumps up and down.

This also allows fixing the behaviour of arrow keys when the menu is
displayed.
  • Loading branch information
@danielhollas
danielhollas committed May 11, 2024
commit eae92aa9580fbc3a0dfb0b583b49b80a598d3e7a
6 changes: 3 additions & 3 deletions Lib/_pyrepl/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ def do(self) -> None:
x, y = r.pos2xy()
new_y = y + 1

if new_y > r.max_row():
if r.eol() == len(b):
Comment thread
pablogsal marked this conversation as resolved.
if r.historyi < len(r.history):
r.select_item(r.historyi + 1)
r.pos = r.eol(0)
Expand All @@ -303,7 +303,7 @@ def do(self) -> None:
class left(MotionCommand):
def do(self) -> None:
r = self.reader
for i in range(r.get_arg()):
for _ in range(r.get_arg()):
p = r.pos - 1
if p >= 0:
r.pos = p
Expand All @@ -315,7 +315,7 @@ class right(MotionCommand):
def do(self) -> None:
r = self.reader
b = r.buffer
for i in range(r.get_arg()):
for _ in range(r.get_arg()):
p = r.pos + 1
if p <= len(b):
r.pos = p
Expand Down
12 changes: 8 additions & 4 deletions Lib/_pyrepl/completing_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
# types
Command = commands.Command
if False:
from .types import Callback, SimpleContextManager, KeySpec, CommandName
from .types import KeySpec, CommandName


def prefix(wordlist: list[str], j: int = 0) -> str:
Expand Down Expand Up @@ -258,10 +258,14 @@ def after_command(self, cmd: Command) -> None:
def calc_screen(self) -> list[str]:
screen = super().calc_screen()
if self.cmpltn_menu_vis:
ly = self.lxy[1]
ly = self.lxy[1] + 1
Comment thread
pablogsal marked this conversation as resolved.
screen[ly:ly] = self.cmpltn_menu
self.screeninfo[ly:ly] = [(0, [])]*len(self.cmpltn_menu)
self.cxy = self.cxy[0], self.cxy[1] + len(self.cmpltn_menu)
Comment thread
pablogsal marked this conversation as resolved.
# This is a horrible hack. If we're not in the middle
# of multiline edit, don't append to screeninfo
# since that screws up the position calculation
# in pos2xy function.
if self.pos != len(self.buffer):
self.screeninfo[ly:ly] = [(0, [])]*len(self.cmpltn_menu)
return screen

def finish(self) -> None:
Expand Down
1 change: 1 addition & 0 deletions Lib/test/test_pyrepl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,7 @@ def test_updown_arrow_with_completion_menu(self):
events = itertools.chain(
code_to_events(code),
[
Event(evt="key", data="down", raw=bytearray(b"\x1bOB")),
Event(evt='key', data='up', raw=bytearray(b'\x1bOA')),
Event(evt="key", data="down", raw=bytearray(b"\x1bOB")),
],
Expand Down