|
37 | 37 | from .layout import LayoutMap, LayoutResult, LayoutRow, WrappedRow, layout_content_lines |
38 | 38 | from .layout import wrapped_row_end |
39 | 39 | from .render import RenderCell, RenderLine, RenderedScreen, ScreenOverlay |
40 | | -from .utils import ANSI_ESCAPE_SEQUENCE, ColorSpan, THEME, StyleRef, gen_colors |
| 40 | +from .utils import ( |
| 41 | + ANSI_ESCAPE_SEQUENCE, ColorSpan, THEME, StyleRef, |
| 42 | + find_matching_delimiter, gen_colors, |
| 43 | +) |
41 | 44 | from .trace import trace |
42 | 45 |
|
43 | 46 |
|
@@ -304,6 +307,7 @@ class Reader: |
304 | 307 | cxy: CursorXY = field(init=False) |
305 | 308 | lxy: CursorXY = field(init=False) |
306 | 309 | scheduled_commands: list[CommandName] = field(default_factory=list) |
| 310 | + _matching_delimiter: tuple[int, int] | None = field(init=False) |
307 | 311 | can_colorize: bool = False |
308 | 312 | gen_colors: Callable[[str], Iterator[ColorSpan]] = gen_colors |
309 | 313 | threading_hook: Callback | None = None |
@@ -386,6 +390,7 @@ def __post_init__(self) -> None: |
386 | 390 | self.input_trans = input.KeymapTranslator( |
387 | 391 | self.keymap, invalid_cls="invalid-key", character_cls="self-insert" |
388 | 392 | ) |
| 393 | + self._matching_delimiter = None |
389 | 394 | self.layout = LayoutMap.empty() |
390 | 395 | self.cxy = self.pos2xy() |
391 | 396 | self.lxy = (self.pos, 0) |
@@ -429,9 +434,8 @@ def calc_screen(self) -> RenderedScreen: |
429 | 434 | self, |
430 | 435 | reuse_full=True, |
431 | 436 | ) |
432 | | - assert not self.last_refresh_cache.line_end_offsets or ( |
433 | | - self.last_refresh_cache.line_end_offsets[-1] >= len(self.buffer) |
434 | | - ), "Buffer modified without invalidate_buffer() call" |
| 437 | + # A short screen can cache only a prefix of the buffer. |
| 438 | + # get_cached_location() then falls back to a full rebuild. |
435 | 439 | else: |
436 | 440 | offset, num_common_lines = self.last_refresh_cache.get_cached_location( |
437 | 441 | self, |
@@ -602,8 +606,51 @@ def _render_message_lines(self) -> tuple[RenderLine, ...]: |
602 | 606 | def get_screen_overlays(self) -> tuple[ScreenOverlay, ...]: |
603 | 607 | return () |
604 | 608 |
|
| 609 | + def _get_matching_delimiter(self) -> tuple[int, int] | None: |
| 610 | + if not self.can_colorize or self.finished: |
| 611 | + return None |
| 612 | + if not any( |
| 613 | + 0 <= i < len(self.buffer) and self.buffer[i] in "()[]{}\"'" |
| 614 | + for i in (self.pos, self.pos - 1) |
| 615 | + ): |
| 616 | + return None |
| 617 | + return find_matching_delimiter(self.get_unicode(), self.pos) |
| 618 | + |
| 619 | + def _matching_delimiter_overlays( |
| 620 | + self, base_screen: RenderedScreen |
| 621 | + ) -> tuple[ScreenOverlay, ...]: |
| 622 | + if ( |
| 623 | + self._matching_delimiter is None |
| 624 | + or not self.last_refresh_cache.line_end_offsets |
| 625 | + ): |
| 626 | + return () |
| 627 | + |
| 628 | + changed_rows: dict[int, list[RenderCell]] = {} |
| 629 | + start, end = self._matching_delimiter |
| 630 | + for offset in range(start, end): |
| 631 | + # pos_to_xy() clamps positions beyond the cached layout. |
| 632 | + if offset >= self.last_refresh_cache.line_end_offsets[-1]: |
| 633 | + break |
| 634 | + # The delimiter's end disambiguates a wrap boundary. |
| 635 | + x, y = self.layout.pos_to_xy(offset + 1) |
| 636 | + cells = changed_rows.setdefault(y, list(base_screen.lines[y].cells)) |
| 637 | + column = 0 |
| 638 | + for i, cell in enumerate(cells): |
| 639 | + if column == x - 1 and cell.width: |
| 640 | + cells[i] = replace( |
| 641 | + cell, style=StyleRef.from_tag("matching_delimiter") |
| 642 | + ) |
| 643 | + break |
| 644 | + column += cell.width |
| 645 | + return tuple( |
| 646 | + ScreenOverlay(y, (RenderLine.from_cells(cells),)) |
| 647 | + for y, cells in changed_rows.items() |
| 648 | + ) |
| 649 | + |
605 | 650 | def compose_rendered_screen(self, base_screen: RenderedScreen) -> RenderedScreen: |
606 | | - overlays = list(self.get_screen_overlays()) |
| 651 | + self._matching_delimiter = self._get_matching_delimiter() |
| 652 | + overlays = list(self._matching_delimiter_overlays(base_screen)) |
| 653 | + overlays.extend(self.get_screen_overlays()) |
607 | 654 | message_lines = self._render_message_lines() |
608 | 655 | if message_lines: |
609 | 656 | overlays.append(ScreenOverlay(len(base_screen.lines), message_lines)) |
@@ -826,6 +873,7 @@ def prepare(self) -> None: |
826 | 873 | self.finished = False |
827 | 874 | del self.buffer[:] |
828 | 875 | self.pos = 0 |
| 876 | + self._matching_delimiter = None |
829 | 877 | self.layout = LayoutMap.empty() |
830 | 878 | self.cxy = self.pos2xy() |
831 | 879 | self.lxy = (self.pos, 0) |
@@ -892,6 +940,11 @@ def error(self, msg: str = "none") -> None: |
892 | 940 | self.invalidate_message() |
893 | 941 |
|
894 | 942 | def update_screen(self) -> None: |
| 943 | + if ( |
| 944 | + not self.invalidation.needs_screen_refresh |
| 945 | + and self._get_matching_delimiter() != self._matching_delimiter |
| 946 | + ): |
| 947 | + self.invalidate_overlay() |
895 | 948 | if self.invalidation.is_cursor_only: |
896 | 949 | self.update_cursor() |
897 | 950 | self.clear_invalidation() |
@@ -939,12 +992,12 @@ def do_cmd(self, cmd: CommandInput) -> None: |
939 | 992 | and not self.invalidation.is_cursor_only |
940 | 993 | ): |
941 | 994 | self.invalidate_cursor() |
| 995 | + self.finished = bool(command.finish) |
942 | 996 | self.update_screen() |
943 | 997 |
|
944 | 998 | if command_type is not commands.digit_arg: |
945 | 999 | self.last_command = command_type |
946 | 1000 |
|
947 | | - self.finished = bool(command.finish) |
948 | 1001 | if self.finished: |
949 | 1002 | self.console.finish() |
950 | 1003 | self.finish() |
|
0 commit comments