Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

gh-132267: fix desynchronized cursor position and buffer mismatch after resize#132360

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Open
ImFeH2 wants to merge1 commit intopython:main
base:main
Choose a base branch
Loading
fromImFeH2:gh-132267
Open
Show file tree
Hide file tree
Changes fromall commits
Commits
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
5 changes: 4 additions & 1 deletionLib/_pyrepl/console.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,7 +71,7 @@ def __init__(
self.output_fd = f_out.fileno()

@abstractmethod
def refresh(self, screen: list[str], xy: tuple[int, int]) -> None: ...
def refresh(self, screen: list[str], xy: tuple[int, int], clear_to_end: bool = False) -> None: ...

@abstractmethod
def prepare(self) -> None: ...
Expand All@@ -82,6 +82,9 @@ def restore(self) -> None: ...
@abstractmethod
def move_cursor(self, x: int, y: int) -> None: ...

@abstractmethod
def reset_cursor(self) -> None: ...

@abstractmethod
def set_cursor_vis(self, visible: bool) -> None: ...

Expand Down
17 changes: 15 additions & 2 deletionsLib/_pyrepl/reader.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -344,7 +344,9 @@ def calc_screen(self) -> list[str]:
pos -= line_len + 1
prompt, prompt_len = self.process_prompt(prompt)
chars, char_widths = disp_str(line, colors, offset)
wrapcount = (sum(char_widths) + prompt_len) // self.console.width
wrapcount = (sum(char_widths) + prompt_len) // (self.console.width - 1) # 1 for line continuations
if (sum(char_widths) + prompt_len) % (self.console.width - 1) == 0:
wrapcount -= 1
if wrapcount == 0 or not char_widths:
offset += line_len + 1 # Takes all of the line plus the newline
last_refresh_line_end_offsets.append(offset)
Expand DownExpand Up@@ -639,6 +641,17 @@ def refresh(self) -> None:
self.console.refresh(self.screen, self.cxy)
self.dirty = False

def handle_resize(self) -> None:
"""Handle a resize event."""
self.console.height, self.console.width = self.console.getheightwidth()
self.console.reset_cursor()
ns = len(self.console.screen) * ["\000" * self.console.width]
self.console.screen = ns

self.screen = self.calc_screen()
self.console.refresh(self.screen, self.cxy, clear_to_end=True)
self.dirty = True

def do_cmd(self, cmd: tuple[str, list[str]]) -> None:
"""`cmd` is a tuple of "event_name" and "event", which in the current
implementation is always just the "buffer" which happens to be a list
Expand DownExpand Up@@ -714,7 +727,7 @@ def handle1(self, block: bool = True) -> bool:
elif event.evt == "scroll":
self.refresh()
elif event.evt == "resize":
self.refresh()
self.handle_resize()
else:
translate = False

Expand Down
23 changes: 19 additions & 4 deletionsLib/_pyrepl/unix_console.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -223,7 +223,7 @@ def change_encoding(self, encoding: str) -> None:
"""
self.encoding = encoding

def refresh(self, screen, c_xy):
def refresh(self, screen, c_xy, clear_to_end = False):
"""
Refresh the console screen.

Expand DownExpand Up@@ -271,8 +271,9 @@ def refresh(self, screen, c_xy):
self.posxy = 0, old_offset
for i in range(old_offset - offset):
self.__write_code(self._ri)
oldscr.pop(-1)
oldscr.insert(0, "")
if len(oldscr) > height:
oldscr.pop(-1)
elif old_offset < offset and self._ind:
self.__hide_cursor()
self.__write_code(self._cup, self.height - 1, 0)
Expand DownExpand Up@@ -300,6 +301,12 @@ def refresh(self, screen, c_xy):
self.__write_code(self._el)
y += 1

if clear_to_end:
self.__move(wlen(newscr[-1]), len(newscr) - 1 + self.__offset)
self.posxy = wlen(newscr[-1]), len(newscr) - 1 + self.__offset
self.__write_code(b"\x1b[J") # clear to end of line
self.flushoutput()

self.__show_cursor()

self.screen = screen.copy()
Expand All@@ -321,6 +328,10 @@ def move_cursor(self, x, y):
self.posxy = x, y
self.flushoutput()

def reset_cursor(self) -> None:
self.posxy = 0, self.__offset
self.__write_code(self._cup, 0, 0)

def prepare(self):
"""
Prepare the console for input/output operations.
Expand DownExpand Up@@ -683,13 +694,18 @@ def __write_changed_line(self, y, oldline, newline, px_coord):
self.__write(newline[x_pos])
self.posxy = character_width + 1, y

if newline[-1] != oldline[-1]:
self.__move(self.width, y)
self.__write(newline[-1])
self.posxy = self.width - 1, y

else:
self.__hide_cursor()
self.__move(x_coord, y)
if wlen(oldline) > wlen(newline):
self.__write_code(self._el)
self.__write(newline[x_pos:])
self.posxy = wlen(newline), y
self.posxy =min(wlen(newline), self.width - 1), y

if "\x1b" in newline:
# ANSI escape characters are present, so we can't assume
Expand DownExpand Up@@ -752,7 +768,6 @@ def __move_tall(self, x, y):
self.__write_code(self._cup, y - self.__offset, x)

def __sigwinch(self, signum, frame):
self.height, self.width = self.getheightwidth()
self.event_queue.insert(Event("resize", None))

def __hide_cursor(self):
Expand Down
15 changes: 13 additions & 2 deletionsLib/_pyrepl/windows_console.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,6 +111,7 @@ def __init__(self, err: int | None, descr: str | None = None) -> None:
MOVE_UP = "\x1b[{}A"
MOVE_DOWN = "\x1b[{}B"
CLEAR = "\x1b[H\x1b[J"
HOME = "\x1b[H"

# State of control keys: https://learn.microsoft.com/en-us/windows/console/key-event-record-str
ALT_ACTIVE = 0x01 | 0x02
Expand DownExpand Up@@ -171,7 +172,7 @@ def __init__(
# Console I/O is redirected, fallback...
self.out = None

def refresh(self, screen: list[str], c_xy: tuple[int, int]) -> None:
def refresh(self, screen: list[str], c_xy: tuple[int, int], clear_to_end: bool = False) -> None:
"""
Refresh the console screen.

Expand DownExpand Up@@ -234,6 +235,12 @@ def refresh(self, screen: list[str], c_xy: tuple[int, int]) -> None:
self._erase_to_end()
y += 1

if clear_to_end:
self._move_relative(wlen(newscr[-1]), self.__offset + len(newscr) - 1)
self.posxy = wlen(newscr[-1]), self.__offset + len(newscr) - 1
self.__write("\x1b[J")
self.flushoutput()

self._show_cursor()

self.screen = screen
Expand DownExpand Up@@ -287,7 +294,7 @@ def __write_changed_line(
self._move_relative(0, y + 1)
self.posxy = 0, y + 1
else:
self.posxy = wlen(newline), y
self.posxy =min(wlen(newline), self.width - 1), y

if "\x1b" in newline or y != self.posxy[1] or '\x1a' in newline:
# ANSI escape characters are present, so we can't assume
Expand DownExpand Up@@ -395,6 +402,10 @@ def move_cursor(self, x: int, y: int) -> None:
self._move_relative(x, y)
self.posxy = x, y

def reset_cursor(self) -> None:
self.posxy = 0, self.__offset
self.__write(HOME)

def set_cursor_vis(self, visible: bool) -> None:
if visible:
self._show_cursor()
Expand Down
5 changes: 4 additions & 1 deletionLib/test/test_pyrepl/support.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,7 +131,7 @@ def getpending(self) -> Event:
def getheightwidth(self) -> tuple[int, int]:
return self.height, self.width

def refresh(self, screen: list[str], xy: tuple[int, int]) -> None:
def refresh(self, screen: list[str], xy: tuple[int, int], clear_to_end: bool = False) -> None:
pass

def prepare(self) -> None:
Expand All@@ -143,6 +143,9 @@ def restore(self) -> None:
def move_cursor(self, x: int, y: int) -> None:
pass

def reset_cursor(self) -> None:
pass

def set_cursor_vis(self, visible: bool) -> None:
pass

Expand Down
4 changes: 2 additions & 2 deletionsLib/test/test_pyrepl/test_unix_console.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -258,7 +258,7 @@ def test_resize_bigger_on_multiline_function(self, _os_write):
reader, console = handle_events_short_unix_console(events)

console.height = 2
console.getheightwidth = MagicMock(lambda _:(2, 80))
console.getheightwidth = MagicMock(return_value=(2, 80))

def same_reader(_):
return reader
Expand DownExpand Up@@ -294,7 +294,7 @@ def test_resize_smaller_on_multiline_function(self, _os_write):
reader, console = handle_events_unix_console_height_3(events)

console.height = 1
console.getheightwidth = MagicMock(lambda _:(1, 80))
console.getheightwidth = MagicMock(return_value=(1, 80))

def same_reader(_):
return reader
Expand Down
23 changes: 13 additions & 10 deletionsLib/test/test_pyrepl/test_windows_console.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@
MOVE_UP,
MOVE_DOWN,
ERASE_IN_LINE,
HOME,
)
import _pyrepl.windows_console as wc
except ImportError:
Expand DownExpand Up@@ -102,7 +103,7 @@ def test_resize_wider(self):

console.height = 20
console.width = 80
console.getheightwidth = MagicMock(lambda _:(20, 80))
console.getheightwidth = MagicMock(return_value=(20, 80))

def same_reader(_):
return reader
Expand All@@ -117,9 +118,8 @@ def same_console(events):
prepare_console=same_console,
)

con.out.write.assert_any_call(self.move_right(2))
con.out.write.assert_any_call(self.move_up(2))
con.out.write.assert_any_call(b"567890")
con.out.write.assert_any_call(self.home())
con.out.write.assert_any_call(b"1234567890")

con.restore()

Expand All@@ -130,7 +130,7 @@ def test_resize_narrower(self):

console.height = 20
console.width = 4
console.getheightwidth = MagicMock(lambda _:(20, 4))
console.getheightwidth = MagicMock(return_value=(20, 4))

def same_reader(_):
return reader
Expand DownExpand Up@@ -264,7 +264,7 @@ def test_resize_bigger_on_multiline_function(self):
reader, console = self.handle_events_short(events)

console.height = 2
console.getheightwidth = MagicMock(lambda _:(2, 80))
console.getheightwidth = MagicMock(return_value=(2, 80))

def same_reader(_):
return reader
Expand All@@ -280,8 +280,9 @@ def same_console(events):
)
con.out.write.assert_has_calls(
[
call(self.move_left(5)),
call(self.home()),
call(self.move_up()),
call(self.erase_in_line()),
call(b"def f():"),
call(self.move_left(3)),
call(self.move_down()),
Expand All@@ -302,7 +303,7 @@ def test_resize_smaller_on_multiline_function(self):
reader, console = self.handle_events_height_3(events)

console.height = 1
console.getheightwidth = MagicMock(lambda _:(1, 80))
console.getheightwidth = MagicMock(return_value=(1, 80))

def same_reader(_):
return reader
Expand All@@ -318,8 +319,7 @@ def same_console(events):
)
con.out.write.assert_has_calls(
[
call(self.move_left(5)),
call(self.move_up()),
call(self.home()),
call(self.erase_in_line()),
call(b" foo"),
]
Expand All@@ -342,6 +342,9 @@ def move_right(self, cols=1):
def erase_in_line(self):
return ERASE_IN_LINE.encode("utf8")

def home(self):
return HOME.encode("utf8")

def test_multiline_ctrl_z(self):
# see gh-126332
code = "abcdefghi"
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
In the New REPL, resize triggers redraw now. Also fixed cross-line width
calculation and content rendering during scrolling.
Loading
[8]ページ先頭
©2009-2025 Movatter.jp