Current fix breaks other tests, revert all changes

Author: tanloong

Lib/_pyrepl/windows_console.py

@@ -283,11 +283,9 @@ def __write_changed_line(
 
         self.__write(newline[x_pos:])
         if wlen(newline) == self.width:
-            # Wrapping with self._move_relative(0, y+1) can't move cursor down
-            # here. Windows keeps the cursor at the end of the line. It only
-            # wraps when the next character is written.
-            # https://github.com/microsoft/terminal/issues/349
-            self.posxy = self.screen_xy[0], y
+            # If we wrapped we want to start at the next line
+            self._move_relative(0, y + 1)
+            self.posxy = 0, y + 1
         else:
             self.posxy = wlen(newline), y
 

Lib/test/test_pyrepl/test_windows_console.py

@@ -16,9 +16,7 @@
 from .support import prepare_reader as default_prepare_reader
 
 try:
-    from _pyrepl._module_completer import ModuleCompleter
     from _pyrepl.console import Event, Console
-    from _pyrepl.readline import ReadlineAlikeReader, ReadlineConfig
     from _pyrepl.windows_console import (
         WindowsConsole,
         MOVE_LEFT,
@@ -65,45 +63,6 @@ def handle_events(
         prepare_reader = prepare_reader or default_prepare_reader
         return handle_all_events(events, prepare_console, prepare_reader)
 
-    def test_cursor_position_console_width_completion_suggestion(self):
-        height, width = 25, 80
-        config = ReadlineConfig()
-        namespace = {"interpreter": None, "process": None, "thread": None}
-        config.module_completer = ModuleCompleter(namespace)
-        code = "from concurrent.futures import \t\tt\n"
-        con = WindowsConsole(encoding="utf-8")
-        con.getheightwidth = MagicMock(return_value=(height, width))
-        con.height = height
-        con.width = width
-
-        def assert_posxy_changed_in_parallel_with_screenxy(method):
-            def wrapper(y, oldline, newline, px_coord):
-                newline = newline.ljust(width)
-                posxy_before = con.posxy
-                screen_xy_before = con.screen_xy
-                result = method(y, oldline, newline, px_coord)
-                posxy_after = con.posxy
-                screen_xy_after = con.screen_xy
-                posxy_delta = (
-                    posxy_after[0] - posxy_before[0],
-                    posxy_after[1] - posxy_before[1],)
-                screen_xy_delta = (
-                    screen_xy_after[0] - screen_xy_before[0],
-                    screen_xy_after[1] - screen_xy_before[1],)
-                self.assertEqual(posxy_delta, screen_xy_delta)
-                return result
-            return wrapper
-
-        original_method = con._WindowsConsole__write_changed_line
-        con._WindowsConsole__write_changed_line = (
-            assert_posxy_changed_in_parallel_with_screenxy(original_method)
-        )
-
-        for c in code:
-            con.event_queue.push(bytes(c.encode("utf-8")))
-        reader = ReadlineAlikeReader(console=con, config=config)
-        reader.readline()
-
     def handle_events_narrow(self, events):
         return self.handle_events(events, width=5)