python
diff --git a/‎Lib/_pyrepl/commands.py
Copy file name to clipboardExpand all lines: Lib/_pyrepl/commands.py
+3-3Lines changed: 3 additions & 3 deletions b/‎Lib/_pyrepl/commands.py
Copy file name to clipboardExpand all lines: Lib/_pyrepl/commands.py
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎Lib/_pyrepl/completing_reader.py
Copy file name to clipboardExpand all lines: Lib/_pyrepl/completing_reader.py
+8-4Lines changed: 8 additions & 4 deletions b/‎Lib/_pyrepl/completing_reader.py
Copy file name to clipboardExpand all lines: Lib/_pyrepl/completing_reader.py
+8-4Lines changed: 8 additions & 4 deletions
diff --git a/‎Lib/test/test_pyrepl.py
Copy file name to clipboardExpand all lines: Lib/test/test_pyrepl.py
+1Lines changed: 1 addition & 0 deletions b/‎Lib/test/test_pyrepl.py
Copy file name to clipboardExpand all lines: Lib/test/test_pyrepl.py
+1Lines changed: 1 addition & 0 deletions
@@ -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):
                 if r.historyi < len(r.history):
                     r.select_item(r.historyi + 1)
                     r.pos = r.eol(0)
@@ -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
@@ -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
 
@@ -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:
@@ -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
             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)
+            # 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:
 
@@ -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")),
             ],
Original file line number	Diff line number	Diff line change
`@@ -617,6 +617,7 @@ def test_updown_arrow_with_completion_menu(self):`
`617`	`617`	`events = itertools.chain(`
`618`	`618`	`code_to_events(code),`
`619`	`619`	`[`
	`620`	`+ Event(evt="key", data="down", raw=bytearray(b"\x1bOB")),`
`620`	`621`	`Event(evt='key', data='up', raw=bytearray(b'\x1bOA')),`
`621`	`622`	`Event(evt="key", data="down", raw=bytearray(b"\x1bOB")),`
`622`	`623`	`],`