2024-05-05 21:32:23 +02:00
|
|
|
# Copyright 2000-2010 Michael Hudson-Doyle <micahel@gmail.com>
|
|
|
|
|
# Antonio Cuni
|
|
|
|
|
# Armin Rigo
|
|
|
|
|
#
|
|
|
|
|
# All Rights Reserved
|
|
|
|
|
#
|
|
|
|
|
#
|
|
|
|
|
# Permission to use, copy, modify, and distribute this software and
|
|
|
|
|
# its documentation for any purpose is hereby granted without fee,
|
|
|
|
|
# provided that the above copyright notice appear in all copies and
|
|
|
|
|
# that both that copyright notice and this permission notice appear in
|
|
|
|
|
# supporting documentation.
|
|
|
|
|
#
|
|
|
|
|
# THE AUTHOR MICHAEL HUDSON DISCLAIMS ALL WARRANTIES WITH REGARD TO
|
|
|
|
|
# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
|
|
|
|
|
# AND FITNESS, IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL,
|
|
|
|
|
# INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
|
|
|
|
|
# RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
|
|
|
|
|
# CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
|
|
|
|
|
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
|
|
|
|
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
2024-07-30 05:03:52 -07:00
|
|
|
import sys
|
2025-05-02 20:22:31 +02:00
|
|
|
import _colorize
|
2024-07-30 05:03:52 -07:00
|
|
|
|
2024-05-05 21:32:23 +02:00
|
|
|
from contextlib import contextmanager
|
2026-04-08 23:42:26 +01:00
|
|
|
from dataclasses import dataclass, field, fields, replace
|
|
|
|
|
from typing import Self
|
2024-05-05 21:32:23 +02:00
|
|
|
|
|
|
|
|
from . import commands, console, input
|
2026-04-08 23:42:26 +01:00
|
|
|
from .content import (
|
|
|
|
|
ContentFragment,
|
|
|
|
|
ContentLine,
|
|
|
|
|
SourceLine,
|
|
|
|
|
build_body_fragments,
|
|
|
|
|
process_prompt as build_prompt_content,
|
|
|
|
|
)
|
|
|
|
|
from .layout import LayoutMap, LayoutResult, LayoutRow, WrappedRow, layout_content_lines
|
|
|
|
|
from .render import RenderCell, RenderLine, RenderedScreen, ScreenOverlay
|
|
|
|
|
from .utils import ANSI_ESCAPE_SEQUENCE, THEME, StyleRef, wlen, gen_colors
|
2024-05-05 21:32:23 +02:00
|
|
|
from .trace import trace
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# types
|
|
|
|
|
Command = commands.Command
|
2026-04-08 23:42:26 +01:00
|
|
|
from .types import (
|
|
|
|
|
Callback,
|
|
|
|
|
CommandName,
|
|
|
|
|
CursorXY,
|
|
|
|
|
Dimensions,
|
|
|
|
|
EventData,
|
|
|
|
|
KeySpec,
|
|
|
|
|
Keymap,
|
|
|
|
|
ScreenInfoRow,
|
|
|
|
|
SimpleContextManager,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
type CommandClass = type[Command]
|
|
|
|
|
type CommandInput = tuple[CommandName | CommandClass, EventData]
|
|
|
|
|
type PromptCellCacheKey = tuple[str, bool]
|
2024-05-05 21:32:23 +02:00
|
|
|
|
|
|
|
|
|
2025-05-02 20:22:31 +02:00
|
|
|
# syntax classes
|
2024-05-05 21:32:23 +02:00
|
|
|
SYNTAX_WHITESPACE, SYNTAX_WORD, SYNTAX_SYMBOL = range(3)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def make_default_syntax_table() -> dict[str, int]:
|
|
|
|
|
# XXX perhaps should use some unicodedata here?
|
|
|
|
|
st: dict[str, int] = {}
|
|
|
|
|
for c in map(chr, range(256)):
|
|
|
|
|
st[c] = SYNTAX_SYMBOL
|
|
|
|
|
for c in [a for a in map(chr, range(256)) if a.isalnum()]:
|
|
|
|
|
st[c] = SYNTAX_WORD
|
|
|
|
|
st["\n"] = st[" "] = SYNTAX_WHITESPACE
|
|
|
|
|
return st
|
|
|
|
|
|
|
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
def make_default_commands() -> dict[CommandName, CommandClass]:
|
|
|
|
|
result: dict[CommandName, CommandClass] = {}
|
2024-05-05 21:32:23 +02:00
|
|
|
for v in vars(commands).values():
|
|
|
|
|
if isinstance(v, type) and issubclass(v, Command) and v.__name__[0].islower():
|
|
|
|
|
result[v.__name__] = v
|
|
|
|
|
result[v.__name__.replace("_", "-")] = v
|
|
|
|
|
return result
|
|
|
|
|
|
|
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
default_keymap: Keymap = tuple(
|
2024-05-05 21:32:23 +02:00
|
|
|
[
|
|
|
|
|
(r"\C-a", "beginning-of-line"),
|
|
|
|
|
(r"\C-b", "left"),
|
|
|
|
|
(r"\C-c", "interrupt"),
|
|
|
|
|
(r"\C-d", "delete"),
|
|
|
|
|
(r"\C-e", "end-of-line"),
|
|
|
|
|
(r"\C-f", "right"),
|
|
|
|
|
(r"\C-g", "cancel"),
|
|
|
|
|
(r"\C-h", "backspace"),
|
|
|
|
|
(r"\C-j", "accept"),
|
|
|
|
|
(r"\<return>", "accept"),
|
|
|
|
|
(r"\C-k", "kill-line"),
|
|
|
|
|
(r"\C-l", "clear-screen"),
|
|
|
|
|
(r"\C-m", "accept"),
|
|
|
|
|
(r"\C-t", "transpose-characters"),
|
|
|
|
|
(r"\C-u", "unix-line-discard"),
|
|
|
|
|
(r"\C-w", "unix-word-rubout"),
|
|
|
|
|
(r"\C-x\C-u", "upcase-region"),
|
|
|
|
|
(r"\C-y", "yank"),
|
2024-07-30 05:03:52 -07:00
|
|
|
*(() if sys.platform == "win32" else ((r"\C-z", "suspend"), )),
|
2024-05-05 21:32:23 +02:00
|
|
|
(r"\M-b", "backward-word"),
|
|
|
|
|
(r"\M-c", "capitalize-word"),
|
|
|
|
|
(r"\M-d", "kill-word"),
|
|
|
|
|
(r"\M-f", "forward-word"),
|
|
|
|
|
(r"\M-l", "downcase-word"),
|
|
|
|
|
(r"\M-t", "transpose-words"),
|
|
|
|
|
(r"\M-u", "upcase-word"),
|
|
|
|
|
(r"\M-y", "yank-pop"),
|
|
|
|
|
(r"\M--", "digit-arg"),
|
|
|
|
|
(r"\M-0", "digit-arg"),
|
|
|
|
|
(r"\M-1", "digit-arg"),
|
|
|
|
|
(r"\M-2", "digit-arg"),
|
|
|
|
|
(r"\M-3", "digit-arg"),
|
|
|
|
|
(r"\M-4", "digit-arg"),
|
|
|
|
|
(r"\M-5", "digit-arg"),
|
|
|
|
|
(r"\M-6", "digit-arg"),
|
|
|
|
|
(r"\M-7", "digit-arg"),
|
|
|
|
|
(r"\M-8", "digit-arg"),
|
|
|
|
|
(r"\M-9", "digit-arg"),
|
2024-07-15 19:47:56 +02:00
|
|
|
(r"\M-\n", "accept"),
|
2024-05-05 21:32:23 +02:00
|
|
|
("\\\\", "self-insert"),
|
2025-05-02 20:22:31 +02:00
|
|
|
(r"\x1b[200~", "perform-bracketed-paste"),
|
2024-05-31 16:26:02 -04:00
|
|
|
(r"\x03", "ctrl-c"),
|
2024-05-05 21:32:23 +02:00
|
|
|
]
|
|
|
|
|
+ [(c, "self-insert") for c in map(chr, range(32, 127)) if c != "\\"]
|
|
|
|
|
+ [(c, "self-insert") for c in map(chr, range(128, 256)) if c.isalpha()]
|
|
|
|
|
+ [
|
|
|
|
|
(r"\<up>", "up"),
|
|
|
|
|
(r"\<down>", "down"),
|
|
|
|
|
(r"\<left>", "left"),
|
2024-05-21 12:17:41 -04:00
|
|
|
(r"\C-\<left>", "backward-word"),
|
2024-05-05 21:32:23 +02:00
|
|
|
(r"\<right>", "right"),
|
2024-05-21 12:17:41 -04:00
|
|
|
(r"\C-\<right>", "forward-word"),
|
2024-05-05 21:32:23 +02:00
|
|
|
(r"\<delete>", "delete"),
|
2024-09-13 03:07:23 +02:00
|
|
|
(r"\x1b[3~", "delete"),
|
2024-05-05 21:32:23 +02:00
|
|
|
(r"\<backspace>", "backspace"),
|
|
|
|
|
(r"\M-\<backspace>", "backward-kill-word"),
|
|
|
|
|
(r"\<end>", "end-of-line"), # was 'end'
|
|
|
|
|
(r"\<home>", "beginning-of-line"), # was 'home'
|
|
|
|
|
(r"\<f1>", "help"),
|
|
|
|
|
(r"\<f2>", "show-history"),
|
|
|
|
|
(r"\<f3>", "paste-mode"),
|
|
|
|
|
(r"\EOF", "end"), # the entries in the terminfo database for xterms
|
|
|
|
|
(r"\EOH", "home"), # seem to be wrong. this is a less than ideal
|
|
|
|
|
# workaround
|
|
|
|
|
]
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
@dataclass(frozen=True, slots=True)
|
|
|
|
|
class RefreshInvalidation:
|
|
|
|
|
"""Which parts of the screen need to be recomputed on the next refresh."""
|
|
|
|
|
|
|
|
|
|
cursor_only: bool = False
|
|
|
|
|
buffer_from_pos: int | None = None
|
|
|
|
|
prompt: bool = False
|
|
|
|
|
layout: bool = False
|
|
|
|
|
theme: bool = False
|
|
|
|
|
message: bool = False
|
|
|
|
|
overlay: bool = False
|
|
|
|
|
full: bool = False
|
|
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
|
def empty(cls) -> Self:
|
|
|
|
|
return cls()
|
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
def needs_screen_refresh(self) -> bool:
|
|
|
|
|
return any(
|
|
|
|
|
(
|
|
|
|
|
self.buffer_from_pos is not None,
|
|
|
|
|
self.prompt,
|
|
|
|
|
self.layout,
|
|
|
|
|
self.theme,
|
|
|
|
|
self.message,
|
|
|
|
|
self.overlay,
|
|
|
|
|
self.full,
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
def is_cursor_only(self) -> bool:
|
|
|
|
|
return self.cursor_only and not self.needs_screen_refresh
|
|
|
|
|
|
|
|
|
|
@property
|
|
|
|
|
def buffer_rebuild_from_pos(self) -> int | None:
|
|
|
|
|
if self.full or self.prompt or self.layout or self.theme:
|
|
|
|
|
return 0
|
|
|
|
|
return self.buffer_from_pos
|
|
|
|
|
|
|
|
|
|
def with_cursor(self) -> Self:
|
|
|
|
|
if self.needs_screen_refresh:
|
|
|
|
|
return self
|
|
|
|
|
return replace(self, cursor_only=True)
|
|
|
|
|
|
|
|
|
|
def with_buffer(self, from_pos: int) -> Self:
|
|
|
|
|
current = from_pos
|
|
|
|
|
if self.buffer_from_pos is not None:
|
|
|
|
|
current = min(current, self.buffer_from_pos)
|
|
|
|
|
return replace(self, cursor_only=False, buffer_from_pos=current)
|
|
|
|
|
|
|
|
|
|
def with_prompt(self) -> Self:
|
|
|
|
|
return replace(self, cursor_only=False, prompt=True)
|
|
|
|
|
|
|
|
|
|
def with_layout(self) -> Self:
|
|
|
|
|
return replace(self, cursor_only=False, layout=True)
|
|
|
|
|
|
|
|
|
|
def with_theme(self) -> Self:
|
|
|
|
|
return replace(self, cursor_only=False, theme=True)
|
|
|
|
|
|
|
|
|
|
def with_message(self) -> Self:
|
|
|
|
|
return replace(self, cursor_only=False, message=True)
|
|
|
|
|
|
|
|
|
|
def with_overlay(self) -> Self:
|
|
|
|
|
return replace(self, cursor_only=False, overlay=True)
|
|
|
|
|
|
|
|
|
|
def with_full(self) -> Self:
|
|
|
|
|
return replace(self, cursor_only=False, full=True)
|
|
|
|
|
|
|
|
|
|
|
2024-05-05 21:32:23 +02:00
|
|
|
@dataclass(slots=True)
|
|
|
|
|
class Reader:
|
|
|
|
|
"""The Reader class implements the bare bones of a command reader,
|
|
|
|
|
handling such details as editing and cursor motion. What it does
|
|
|
|
|
not support are such things as completion or history support -
|
|
|
|
|
these are implemented elsewhere.
|
|
|
|
|
|
|
|
|
|
Instance variables of note include:
|
|
|
|
|
|
|
|
|
|
* buffer:
|
2025-05-02 20:22:31 +02:00
|
|
|
A per-character list containing all the characters that have been
|
|
|
|
|
entered. Does not include color information.
|
2024-05-05 21:32:23 +02:00
|
|
|
* console:
|
|
|
|
|
Hopefully encapsulates the OS dependent stuff.
|
|
|
|
|
* pos:
|
2024-05-22 12:35:18 -04:00
|
|
|
A 0-based index into 'buffer' for where the insertion point
|
2024-05-05 21:32:23 +02:00
|
|
|
is.
|
2026-04-08 23:42:26 +01:00
|
|
|
* layout:
|
|
|
|
|
A mapping between buffer positions and rendered rows/columns.
|
|
|
|
|
It is the internal source of truth for cursor placement.
|
2024-05-05 21:32:23 +02:00
|
|
|
* cxy, lxy:
|
|
|
|
|
the position of the insertion point in screen ...
|
|
|
|
|
* syntax_table:
|
2024-05-22 12:35:18 -04:00
|
|
|
Dictionary mapping characters to 'syntax class'; read the
|
2024-05-05 21:32:23 +02:00
|
|
|
emacs docs to see what this means :-)
|
|
|
|
|
* commands:
|
|
|
|
|
Dictionary mapping command names to command classes.
|
|
|
|
|
* arg:
|
|
|
|
|
The emacs-style prefix argument. It will be None if no such
|
|
|
|
|
argument has been provided.
|
|
|
|
|
* kill_ring:
|
|
|
|
|
The emacs-style kill-ring; manipulated with yank & yank-pop
|
|
|
|
|
* ps1, ps2, ps3, ps4:
|
|
|
|
|
prompts. ps1 is the prompt for a one-line input; for a
|
|
|
|
|
multiline input it looks like:
|
|
|
|
|
ps2> first line of input goes here
|
|
|
|
|
ps3> second and further
|
|
|
|
|
ps3> lines get ps3
|
|
|
|
|
...
|
|
|
|
|
ps4> and the last one gets ps4
|
|
|
|
|
As with the usual top-level, you can set these to instances if
|
|
|
|
|
you like; str() will be called on them (once) at the beginning
|
|
|
|
|
of each command. Don't put really long or newline containing
|
|
|
|
|
strings here, please!
|
|
|
|
|
This is just the default policy; you can change it freely by
|
|
|
|
|
overriding get_prompt() (and indeed some standard subclasses
|
|
|
|
|
do).
|
|
|
|
|
* finished:
|
|
|
|
|
handle1 will set this to a true value if a command signals
|
|
|
|
|
that we're done.
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
console: console.Console
|
|
|
|
|
|
|
|
|
|
## state
|
|
|
|
|
buffer: list[str] = field(default_factory=list)
|
|
|
|
|
pos: int = 0
|
|
|
|
|
ps1: str = "->> "
|
|
|
|
|
ps2: str = "/>> "
|
|
|
|
|
ps3: str = "|.. "
|
|
|
|
|
ps4: str = R"\__ "
|
|
|
|
|
kill_ring: list[list[str]] = field(default_factory=list)
|
|
|
|
|
msg: str = ""
|
|
|
|
|
arg: int | None = None
|
|
|
|
|
finished: bool = False
|
|
|
|
|
paste_mode: bool = False
|
2026-04-08 23:42:26 +01:00
|
|
|
commands: dict[CommandName, CommandClass] = field(default_factory=make_default_commands)
|
|
|
|
|
last_command: CommandClass | None = None
|
2024-05-05 21:32:23 +02:00
|
|
|
syntax_table: dict[str, int] = field(default_factory=make_default_syntax_table)
|
2026-04-08 23:42:26 +01:00
|
|
|
keymap: Keymap = ()
|
2024-05-05 21:32:23 +02:00
|
|
|
input_trans: input.KeymapTranslator = field(init=False)
|
|
|
|
|
input_trans_stack: list[input.KeymapTranslator] = field(default_factory=list)
|
2026-04-08 23:42:26 +01:00
|
|
|
rendered_screen: RenderedScreen = field(init=False)
|
|
|
|
|
layout: LayoutMap = field(init=False)
|
|
|
|
|
cxy: CursorXY = field(init=False)
|
|
|
|
|
lxy: CursorXY = field(init=False)
|
|
|
|
|
scheduled_commands: list[CommandName] = field(default_factory=list)
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
can_colorize: bool = False
|
2024-09-06 21:28:29 +02:00
|
|
|
threading_hook: Callback | None = None
|
2026-04-08 23:42:26 +01:00
|
|
|
invalidation: RefreshInvalidation = field(init=False)
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
|
|
|
|
|
## cached metadata to speed up screen refreshes
|
|
|
|
|
@dataclass
|
|
|
|
|
class RefreshCache:
|
2026-04-08 23:42:26 +01:00
|
|
|
"""Previously computed render/layout data for incremental refresh."""
|
|
|
|
|
|
|
|
|
|
render_lines: list[RenderLine] = field(default_factory=list)
|
|
|
|
|
layout_rows: list[LayoutRow] = field(default_factory=list)
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
line_end_offsets: list[int] = field(default_factory=list)
|
2026-04-08 23:42:26 +01:00
|
|
|
pos: int = 0
|
|
|
|
|
dimensions: Dimensions = (0, 0)
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
|
|
|
|
|
def update_cache(self,
|
|
|
|
|
reader: Reader,
|
2026-04-08 23:42:26 +01:00
|
|
|
render_lines: list[RenderLine],
|
|
|
|
|
layout_rows: list[LayoutRow],
|
|
|
|
|
line_end_offsets: list[int],
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
) -> None:
|
2026-04-08 23:42:26 +01:00
|
|
|
self.render_lines = render_lines.copy()
|
|
|
|
|
self.layout_rows = layout_rows.copy()
|
|
|
|
|
self.line_end_offsets = line_end_offsets.copy()
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
self.pos = reader.pos
|
|
|
|
|
self.dimensions = reader.console.width, reader.console.height
|
|
|
|
|
|
|
|
|
|
def valid(self, reader: Reader) -> bool:
|
|
|
|
|
dimensions = reader.console.width, reader.console.height
|
|
|
|
|
dimensions_changed = dimensions != self.dimensions
|
2025-05-02 20:22:31 +02:00
|
|
|
return not dimensions_changed
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
def get_cached_location(
|
|
|
|
|
self,
|
|
|
|
|
reader: Reader,
|
|
|
|
|
buffer_from_pos: int | None = None,
|
|
|
|
|
*,
|
|
|
|
|
reuse_full: bool = False,
|
|
|
|
|
) -> tuple[int, int]:
|
|
|
|
|
"""Return (buffer_offset, num_reusable_lines) for incremental refresh.
|
|
|
|
|
|
|
|
|
|
Three paths:
|
|
|
|
|
- reuse_full (overlay/message-only): reuse all cached lines.
|
|
|
|
|
- buffer_from_pos=None (full rebuild): rewind to common cursor pos.
|
|
|
|
|
- explicit buffer_from_pos: reuse lines before that position.
|
|
|
|
|
"""
|
|
|
|
|
if reuse_full:
|
|
|
|
|
if self.line_end_offsets:
|
|
|
|
|
last_offset = self.line_end_offsets[-1]
|
|
|
|
|
if last_offset >= len(reader.buffer):
|
|
|
|
|
return last_offset, len(self.line_end_offsets)
|
|
|
|
|
return 0, 0
|
|
|
|
|
if buffer_from_pos is None:
|
|
|
|
|
buffer_from_pos = min(reader.pos, self.pos)
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
num_common_lines = len(self.line_end_offsets)
|
|
|
|
|
while num_common_lines > 0:
|
2026-04-08 23:42:26 +01:00
|
|
|
candidate = self.line_end_offsets[num_common_lines - 1]
|
|
|
|
|
if buffer_from_pos > candidate:
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
break
|
|
|
|
|
num_common_lines -= 1
|
2026-04-08 23:42:26 +01:00
|
|
|
# Prompt-only leading rows consume no buffer content. Reusing them
|
|
|
|
|
# in isolation causes the next incremental rebuild to emit them a
|
|
|
|
|
# second time.
|
|
|
|
|
while (
|
|
|
|
|
num_common_lines > 0
|
|
|
|
|
and self.layout_rows[num_common_lines - 1].buffer_advance == 0
|
|
|
|
|
):
|
|
|
|
|
num_common_lines -= 1
|
|
|
|
|
offset = self.line_end_offsets[num_common_lines - 1] if num_common_lines else 0
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
return offset, num_common_lines
|
|
|
|
|
|
|
|
|
|
last_refresh_cache: RefreshCache = field(default_factory=RefreshCache)
|
2024-05-05 21:32:23 +02:00
|
|
|
|
|
|
|
|
def __post_init__(self) -> None:
|
|
|
|
|
# Enable the use of `insert` without a `prepare` call - necessary to
|
|
|
|
|
# facilitate the tab completion hack implemented for
|
|
|
|
|
# <https://bugs.python.org/issue25660>.
|
|
|
|
|
self.keymap = self.collect_keymap()
|
|
|
|
|
self.input_trans = input.KeymapTranslator(
|
|
|
|
|
self.keymap, invalid_cls="invalid-key", character_cls="self-insert"
|
|
|
|
|
)
|
2026-04-08 23:42:26 +01:00
|
|
|
self.layout = LayoutMap.empty()
|
2024-05-05 21:32:23 +02:00
|
|
|
self.cxy = self.pos2xy()
|
|
|
|
|
self.lxy = (self.pos, 0)
|
2026-04-08 23:42:26 +01:00
|
|
|
self.rendered_screen = RenderedScreen.empty()
|
2025-05-02 20:22:31 +02:00
|
|
|
self.can_colorize = _colorize.can_colorize()
|
2026-04-08 23:42:26 +01:00
|
|
|
self.invalidation = RefreshInvalidation.empty()
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
self.last_refresh_cache.layout_rows = list(self.layout.rows)
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
self.last_refresh_cache.pos = self.pos
|
2026-04-08 23:42:26 +01:00
|
|
|
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
self.last_refresh_cache.dimensions = (0, 0)
|
2024-05-05 21:32:23 +02:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
@property
|
|
|
|
|
def screen(self) -> list[str]:
|
|
|
|
|
return list(self.rendered_screen.screen_lines)
|
2024-05-05 21:32:23 +02:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
@property
|
|
|
|
|
def screeninfo(self) -> list[ScreenInfoRow]:
|
|
|
|
|
return self.layout.screeninfo
|
2024-05-21 22:35:44 -04:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
def collect_keymap(self) -> Keymap:
|
|
|
|
|
return default_keymap
|
|
|
|
|
|
|
|
|
|
def calc_screen(self) -> RenderedScreen:
|
|
|
|
|
"""Translate the editable buffer into a base rendered screen."""
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
num_common_lines = 0
|
|
|
|
|
offset = 0
|
|
|
|
|
if self.last_refresh_cache.valid(self):
|
2026-04-08 23:42:26 +01:00
|
|
|
if (
|
|
|
|
|
self.invalidation.buffer_from_pos is None
|
|
|
|
|
and not (
|
|
|
|
|
self.invalidation.full
|
|
|
|
|
or self.invalidation.prompt
|
|
|
|
|
or self.invalidation.layout
|
|
|
|
|
or self.invalidation.theme
|
|
|
|
|
)
|
|
|
|
|
and (self.invalidation.message or self.invalidation.overlay)
|
|
|
|
|
):
|
|
|
|
|
# Fast path: only overlays or messages changed.
|
|
|
|
|
offset, num_common_lines = self.last_refresh_cache.get_cached_location(
|
|
|
|
|
self,
|
|
|
|
|
reuse_full=True,
|
|
|
|
|
)
|
|
|
|
|
assert not self.last_refresh_cache.line_end_offsets or (
|
|
|
|
|
self.last_refresh_cache.line_end_offsets[-1] >= len(self.buffer)
|
|
|
|
|
), "Buffer modified without invalidate_buffer() call"
|
|
|
|
|
else:
|
|
|
|
|
offset, num_common_lines = self.last_refresh_cache.get_cached_location(
|
|
|
|
|
self,
|
|
|
|
|
self._buffer_refresh_from_pos(),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
base_render_lines = self.last_refresh_cache.render_lines[:num_common_lines]
|
|
|
|
|
layout_rows = self.last_refresh_cache.layout_rows[:num_common_lines]
|
|
|
|
|
last_refresh_line_end_offsets = self.last_refresh_cache.line_end_offsets[:num_common_lines]
|
|
|
|
|
|
|
|
|
|
source_lines = self._build_source_lines(offset, num_common_lines)
|
|
|
|
|
content_lines = self._build_content_lines(
|
|
|
|
|
source_lines,
|
|
|
|
|
prompt_from_cache=bool(offset and self.buffer[offset - 1] != "\n"),
|
|
|
|
|
)
|
|
|
|
|
layout_result = self._layout_content(content_lines, offset)
|
|
|
|
|
base_render_lines.extend(self._render_wrapped_rows(layout_result.wrapped_rows))
|
|
|
|
|
layout_rows.extend(layout_result.layout_map.rows)
|
|
|
|
|
last_refresh_line_end_offsets.extend(layout_result.line_end_offsets)
|
2024-05-21 22:35:44 -04:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
self.layout = LayoutMap(tuple(layout_rows))
|
|
|
|
|
self.cxy = self.pos2xy()
|
|
|
|
|
if not source_lines:
|
|
|
|
|
# reuse_full path: _build_source_lines didn't run,
|
|
|
|
|
# so lxy wasn't updated. Derive it from the buffer.
|
|
|
|
|
self.lxy = self._compute_lxy()
|
|
|
|
|
self.last_refresh_cache.update_cache(
|
|
|
|
|
self,
|
|
|
|
|
base_render_lines,
|
|
|
|
|
layout_rows,
|
|
|
|
|
last_refresh_line_end_offsets,
|
|
|
|
|
)
|
|
|
|
|
return RenderedScreen(tuple(base_render_lines), self.cxy)
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
def _buffer_refresh_from_pos(self) -> int:
|
|
|
|
|
"""Return buffer position from which to rebuild content.
|
2025-05-02 20:22:31 +02:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
Returns 0 (full rebuild) when no incremental position is known.
|
|
|
|
|
"""
|
|
|
|
|
buffer_from_pos = self.invalidation.buffer_rebuild_from_pos
|
|
|
|
|
if buffer_from_pos is not None:
|
|
|
|
|
return buffer_from_pos
|
|
|
|
|
return 0
|
|
|
|
|
|
|
|
|
|
def _compute_lxy(self) -> CursorXY:
|
|
|
|
|
"""Derive logical cursor (col, lineno) from the buffer and pos."""
|
|
|
|
|
text = "".join(self.buffer[:self.pos])
|
|
|
|
|
lineno = text.count("\n")
|
|
|
|
|
if lineno:
|
|
|
|
|
col = self.pos - text.rindex("\n") - 1
|
2025-05-02 20:22:31 +02:00
|
|
|
else:
|
2026-04-08 23:42:26 +01:00
|
|
|
col = self.pos
|
|
|
|
|
return col, lineno
|
|
|
|
|
|
|
|
|
|
def _build_source_lines(
|
|
|
|
|
self,
|
|
|
|
|
offset: int,
|
|
|
|
|
first_lineno: int,
|
|
|
|
|
) -> tuple[SourceLine, ...]:
|
|
|
|
|
if offset == len(self.buffer) and (offset > 0 or first_lineno > 0):
|
|
|
|
|
return ()
|
|
|
|
|
|
|
|
|
|
pos = self.pos - offset
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
lines = "".join(self.buffer[offset:]).split("\n")
|
|
|
|
|
cursor_found = False
|
|
|
|
|
lines_beyond_cursor = 0
|
2026-04-08 23:42:26 +01:00
|
|
|
source_lines: list[SourceLine] = []
|
|
|
|
|
current_offset = offset
|
|
|
|
|
|
|
|
|
|
for line_index, line in enumerate(lines):
|
|
|
|
|
lineno = first_lineno + line_index
|
|
|
|
|
has_newline = line_index < len(lines) - 1
|
2025-03-21 18:27:35 +01:00
|
|
|
line_len = len(line)
|
2026-04-08 23:42:26 +01:00
|
|
|
cursor_index: int | None = None
|
2025-03-21 18:27:35 +01:00
|
|
|
if 0 <= pos <= line_len:
|
2026-04-08 23:42:26 +01:00
|
|
|
cursor_index = pos
|
|
|
|
|
self.lxy = pos, lineno
|
gh-119517: Fixes for pasting in pyrepl (#120253)
* Remove pyrepl's optimization for self-insert
This will be replaced by a less specialized optimization.
* Use line-buffering when pyrepl echoes pastes
Previously echoing was totally suppressed until the entire command had
been pasted and the terminal ended paste mode, but this gives the user
no feedback to indicate that an operation is in progress. Drawing
something to the screen once per line strikes a balance between
perceived responsiveness and performance.
* Remove dead code from pyrepl
`msg_at_bottom` is always true.
* Speed up pyrepl's screen rendering computation
The Reader in pyrepl doesn't hold a complete representation of the
screen area being drawn as persistent state. Instead, it recomputes it,
on each keypress. This is fast enough for a few hundred bytes, but
incredibly slow as the input buffer grows into the kilobytes (likely
because of pasting).
Rather than making some expensive and expansive changes to the repl's
internal representation of the screen, add some caching: remember some
data from one refresh to the next about what was drawn to the screen
and, if we don't find anything that has invalidated the results that
were computed last time around, reuse them. To keep this caching as
simple as possible, all we'll do is look for lines in the buffer that
were above the cursor the last time we were asked to update the screen,
and that are still above the cursor now. We assume that nothing can
affect a line that comes before both the old and new cursor location
without us being informed. Based on this assumption, we can reuse old
lines, which drastically speeds up the overwhelmingly common case where
the user is typing near the end of the buffer.
* Speed up pyrepl prompt drawing
Cache the `can_colorize()` call rather than repeatedly recomputing it.
This call looks up an environment variable, and is called once per
character typed at the REPL. The environment variable lookup shows up as
a hot spot when profiling, and we don't expect this to change while the
REPL is running.
* Speed up pasting multiple lines into the REPL
Previously, we were checking whether the command should be accepted each
time a line break was encountered, but that's not the expected behavior.
In bracketed paste mode, we expect everything pasted to be part of
a single block of code, and encountering a newline shouldn't behave like
a user pressing <Enter> to execute a command. The user should always
have a chance to review the pasted command before running it.
* Use a read buffer for input in pyrepl
Previously we were reading one byte at a time, which causes much slower
IO than necessary. Instead, read in chunks, processing previously read
data before asking for more.
* Optimize finding width of a single character
`wlen` finds the width of a multi-character string by adding up the
width of each character, and then subtracting the width of any escape
sequences. It's often called for single character strings, however,
which can't possibly contain escape sequences. Optimize for that case.
* Optimize disp_str for ASCII characters
Since every ASCII character is known to display as single width, we can
avoid not only the Unicode data lookup in `disp_str` but also the one
hidden in `str_width` for them.
* Speed up cursor movements in long pyrepl commands
When the current pyrepl command buffer contains many lines, scrolling up
becomes slow. We have optimizations in place to reuse lines above the
cursor position from one refresh to the next, but don't currently try to
reuse lines below the cursor position in the same way, so we wind up
with quadratic behavior where all lines of the buffer below the cursor
are recomputed each time the cursor moves up another line.
Optimize this by only computing one screen's worth of lines beyond the
cursor position. Any lines beyond that can't possibly be shown by the
console, and bounding this makes scrolling up have linear time
complexity instead.
---------
Signed-off-by: Matt Wozniski <mwozniski@bloomberg.net>
Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2024-06-11 12:42:10 -04:00
|
|
|
cursor_found = True
|
|
|
|
|
elif cursor_found:
|
|
|
|
|
lines_beyond_cursor += 1
|
|
|
|
|
if lines_beyond_cursor > self.console.height:
|
|
|
|
|
break
|
2026-04-08 23:42:26 +01:00
|
|
|
|
|
|
|
|
source_lines.append(
|
|
|
|
|
SourceLine(
|
|
|
|
|
lineno=lineno,
|
|
|
|
|
text=line,
|
|
|
|
|
start_offset=current_offset,
|
|
|
|
|
has_newline=has_newline,
|
|
|
|
|
cursor_index=cursor_index,
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
pos -= line_len + 1
|
|
|
|
|
current_offset += line_len + (1 if has_newline else 0)
|
|
|
|
|
|
|
|
|
|
return tuple(source_lines)
|
|
|
|
|
|
|
|
|
|
def _build_content_lines(
|
|
|
|
|
self,
|
|
|
|
|
source_lines: tuple[SourceLine, ...],
|
|
|
|
|
*,
|
|
|
|
|
prompt_from_cache: bool,
|
|
|
|
|
) -> tuple[ContentLine, ...]:
|
|
|
|
|
if self.can_colorize:
|
|
|
|
|
colors = list(gen_colors(self.get_unicode()))
|
|
|
|
|
else:
|
|
|
|
|
colors = None
|
|
|
|
|
trace("colors = {colors}", colors=colors)
|
|
|
|
|
|
|
|
|
|
content_lines: list[ContentLine] = []
|
|
|
|
|
for source_line in source_lines:
|
2024-08-25 18:54:06 -04:00
|
|
|
if prompt_from_cache:
|
|
|
|
|
prompt_from_cache = False
|
|
|
|
|
prompt = ""
|
|
|
|
|
else:
|
2026-04-08 23:42:26 +01:00
|
|
|
prompt = self.get_prompt(source_line.lineno, source_line.cursor_on_line)
|
|
|
|
|
content_lines.append(
|
|
|
|
|
ContentLine(
|
|
|
|
|
source=source_line,
|
|
|
|
|
prompt=build_prompt_content(prompt),
|
|
|
|
|
body=build_body_fragments(
|
|
|
|
|
source_line.text,
|
|
|
|
|
colors,
|
|
|
|
|
source_line.start_offset,
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
return tuple(content_lines)
|
|
|
|
|
|
|
|
|
|
def _layout_content(
|
|
|
|
|
self,
|
|
|
|
|
content_lines: tuple[ContentLine, ...],
|
|
|
|
|
offset: int,
|
|
|
|
|
) -> LayoutResult:
|
|
|
|
|
return layout_content_lines(content_lines, self.console.width, offset)
|
|
|
|
|
|
|
|
|
|
def _render_wrapped_rows(
|
|
|
|
|
self,
|
|
|
|
|
wrapped_rows: tuple[WrappedRow, ...],
|
|
|
|
|
) -> list[RenderLine]:
|
|
|
|
|
return [
|
|
|
|
|
self._render_line(
|
|
|
|
|
row.prompt_text,
|
|
|
|
|
row.fragments,
|
|
|
|
|
row.suffix,
|
|
|
|
|
)
|
|
|
|
|
for row in wrapped_rows
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
def _render_message_lines(self) -> tuple[RenderLine, ...]:
|
|
|
|
|
if not self.msg:
|
|
|
|
|
return ()
|
|
|
|
|
width = self.console.width
|
|
|
|
|
render_lines: list[RenderLine] = []
|
|
|
|
|
for message_line in self.msg.split("\n"):
|
|
|
|
|
# If self.msg is larger than console width, make it fit.
|
|
|
|
|
# TODO: try to split between words?
|
|
|
|
|
if not message_line:
|
|
|
|
|
render_lines.append(RenderLine.from_rendered_text(""))
|
|
|
|
|
continue
|
|
|
|
|
for offset in range(0, len(message_line), width):
|
|
|
|
|
render_lines.append(
|
|
|
|
|
RenderLine.from_rendered_text(message_line[offset : offset + width])
|
|
|
|
|
)
|
|
|
|
|
return tuple(render_lines)
|
|
|
|
|
|
|
|
|
|
def get_screen_overlays(self) -> tuple[ScreenOverlay, ...]:
|
|
|
|
|
return ()
|
|
|
|
|
|
|
|
|
|
def compose_rendered_screen(self, base_screen: RenderedScreen) -> RenderedScreen:
|
|
|
|
|
overlays = list(self.get_screen_overlays())
|
|
|
|
|
message_lines = self._render_message_lines()
|
|
|
|
|
if message_lines:
|
|
|
|
|
overlays.append(ScreenOverlay(len(base_screen.lines), message_lines))
|
|
|
|
|
if not overlays:
|
|
|
|
|
return base_screen
|
|
|
|
|
return RenderedScreen(base_screen.lines, base_screen.cursor, tuple(overlays))
|
|
|
|
|
|
|
|
|
|
_prompt_cell_cache: dict[PromptCellCacheKey, tuple[RenderCell, ...]] = field(
|
|
|
|
|
init=False, default_factory=dict, repr=False
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
def _render_line(
|
|
|
|
|
self,
|
|
|
|
|
prefix: str,
|
|
|
|
|
fragments: tuple[ContentFragment, ...],
|
|
|
|
|
suffix: str = "",
|
|
|
|
|
) -> RenderLine:
|
|
|
|
|
cells: list[RenderCell] = []
|
|
|
|
|
if prefix:
|
|
|
|
|
cache_key = (prefix, self.can_colorize)
|
|
|
|
|
cached = self._prompt_cell_cache.get(cache_key)
|
|
|
|
|
if cached is None:
|
|
|
|
|
prompt_cells = RenderLine.from_rendered_text(prefix).cells
|
|
|
|
|
if self.can_colorize and prompt_cells and not ANSI_ESCAPE_SEQUENCE.search(prefix):
|
|
|
|
|
prompt_style = StyleRef.from_tag("prompt", THEME()["prompt"])
|
|
|
|
|
prompt_cells = tuple(
|
|
|
|
|
RenderCell(
|
|
|
|
|
cell.text,
|
|
|
|
|
cell.width,
|
|
|
|
|
style=prompt_style if cell.text else cell.style,
|
|
|
|
|
controls=cell.controls,
|
|
|
|
|
)
|
|
|
|
|
for cell in prompt_cells
|
|
|
|
|
)
|
|
|
|
|
self._prompt_cell_cache[cache_key] = prompt_cells
|
|
|
|
|
cached = prompt_cells
|
|
|
|
|
cells.extend(cached)
|
|
|
|
|
cells.extend(
|
|
|
|
|
RenderCell(fragment.text, fragment.width, style=fragment.style)
|
|
|
|
|
for fragment in fragments
|
|
|
|
|
)
|
|
|
|
|
if suffix:
|
|
|
|
|
cells.extend(RenderLine.from_rendered_text(suffix).cells)
|
|
|
|
|
return RenderLine.from_cells(cells)
|
2024-05-05 21:32:23 +02:00
|
|
|
|
2024-06-03 18:07:06 +01:00
|
|
|
@staticmethod
|
|
|
|
|
def process_prompt(prompt: str) -> tuple[str, int]:
|
2025-03-21 15:48:10 +01:00
|
|
|
r"""Return a tuple with the prompt string and its visible length.
|
|
|
|
|
|
|
|
|
|
The prompt string has the zero-width brackets recognized by shells
|
|
|
|
|
(\x01 and \x02) removed. The length ignores anything between those
|
|
|
|
|
brackets as well as any ANSI escape sequences.
|
|
|
|
|
"""
|
2026-04-08 23:42:26 +01:00
|
|
|
prompt_content = build_prompt_content(prompt)
|
|
|
|
|
return prompt_content.text, prompt_content.width
|
2024-05-05 21:32:23 +02:00
|
|
|
|
|
|
|
|
def bow(self, p: int | None = None) -> int:
|
|
|
|
|
"""Return the 0-based index of the word break preceding p most
|
|
|
|
|
immediately.
|
|
|
|
|
|
|
|
|
|
p defaults to self.pos; word boundaries are determined using
|
|
|
|
|
self.syntax_table."""
|
|
|
|
|
if p is None:
|
|
|
|
|
p = self.pos
|
|
|
|
|
st = self.syntax_table
|
|
|
|
|
b = self.buffer
|
|
|
|
|
p -= 1
|
|
|
|
|
while p >= 0 and st.get(b[p], SYNTAX_WORD) != SYNTAX_WORD:
|
|
|
|
|
p -= 1
|
|
|
|
|
while p >= 0 and st.get(b[p], SYNTAX_WORD) == SYNTAX_WORD:
|
|
|
|
|
p -= 1
|
|
|
|
|
return p + 1
|
|
|
|
|
|
|
|
|
|
def eow(self, p: int | None = None) -> int:
|
|
|
|
|
"""Return the 0-based index of the word break following p most
|
|
|
|
|
immediately.
|
|
|
|
|
|
|
|
|
|
p defaults to self.pos; word boundaries are determined using
|
|
|
|
|
self.syntax_table."""
|
|
|
|
|
if p is None:
|
|
|
|
|
p = self.pos
|
|
|
|
|
st = self.syntax_table
|
|
|
|
|
b = self.buffer
|
|
|
|
|
while p < len(b) and st.get(b[p], SYNTAX_WORD) != SYNTAX_WORD:
|
|
|
|
|
p += 1
|
|
|
|
|
while p < len(b) and st.get(b[p], SYNTAX_WORD) == SYNTAX_WORD:
|
|
|
|
|
p += 1
|
|
|
|
|
return p
|
|
|
|
|
|
|
|
|
|
def bol(self, p: int | None = None) -> int:
|
|
|
|
|
"""Return the 0-based index of the line break preceding p most
|
|
|
|
|
immediately.
|
|
|
|
|
|
|
|
|
|
p defaults to self.pos."""
|
|
|
|
|
if p is None:
|
|
|
|
|
p = self.pos
|
|
|
|
|
b = self.buffer
|
|
|
|
|
p -= 1
|
|
|
|
|
while p >= 0 and b[p] != "\n":
|
|
|
|
|
p -= 1
|
|
|
|
|
return p + 1
|
|
|
|
|
|
|
|
|
|
def eol(self, p: int | None = None) -> int:
|
|
|
|
|
"""Return the 0-based index of the line break following p most
|
|
|
|
|
immediately.
|
|
|
|
|
|
|
|
|
|
p defaults to self.pos."""
|
|
|
|
|
if p is None:
|
|
|
|
|
p = self.pos
|
|
|
|
|
b = self.buffer
|
|
|
|
|
while p < len(b) and b[p] != "\n":
|
|
|
|
|
p += 1
|
|
|
|
|
return p
|
|
|
|
|
|
|
|
|
|
def max_column(self, y: int) -> int:
|
|
|
|
|
"""Return the last x-offset for line y"""
|
2026-04-08 23:42:26 +01:00
|
|
|
return self.layout.max_column(y)
|
2024-05-05 21:32:23 +02:00
|
|
|
|
|
|
|
|
def max_row(self) -> int:
|
2026-04-08 23:42:26 +01:00
|
|
|
return self.layout.max_row()
|
2024-05-05 21:32:23 +02:00
|
|
|
|
|
|
|
|
def get_arg(self, default: int = 1) -> int:
|
|
|
|
|
"""Return any prefix argument that the user has supplied,
|
2024-05-22 12:35:18 -04:00
|
|
|
returning 'default' if there is None. Defaults to 1.
|
2024-05-05 21:32:23 +02:00
|
|
|
"""
|
|
|
|
|
if self.arg is None:
|
|
|
|
|
return default
|
2024-05-31 00:49:03 -07:00
|
|
|
return self.arg
|
2024-05-05 21:32:23 +02:00
|
|
|
|
|
|
|
|
def get_prompt(self, lineno: int, cursor_on_line: bool) -> str:
|
|
|
|
|
"""Return what should be in the left-hand margin for line
|
2024-05-22 12:35:18 -04:00
|
|
|
'lineno'."""
|
2024-05-05 21:32:23 +02:00
|
|
|
if self.arg is not None and cursor_on_line:
|
2024-05-31 00:49:03 -07:00
|
|
|
prompt = f"(arg: {self.arg}) "
|
2025-05-02 20:22:31 +02:00
|
|
|
elif self.paste_mode:
|
2024-05-05 21:32:23 +02:00
|
|
|
prompt = "(paste) "
|
|
|
|
|
elif "\n" in self.buffer:
|
|
|
|
|
if lineno == 0:
|
|
|
|
|
prompt = self.ps2
|
2024-05-22 01:28:32 -04:00
|
|
|
elif self.ps4 and lineno == self.buffer.count("\n"):
|
2024-05-05 21:32:23 +02:00
|
|
|
prompt = self.ps4
|
|
|
|
|
else:
|
|
|
|
|
prompt = self.ps3
|
|
|
|
|
else:
|
|
|
|
|
prompt = self.ps1
|
|
|
|
|
return prompt
|
|
|
|
|
|
|
|
|
|
def push_input_trans(self, itrans: input.KeymapTranslator) -> None:
|
|
|
|
|
self.input_trans_stack.append(self.input_trans)
|
|
|
|
|
self.input_trans = itrans
|
|
|
|
|
|
|
|
|
|
def pop_input_trans(self) -> None:
|
|
|
|
|
self.input_trans = self.input_trans_stack.pop()
|
|
|
|
|
|
|
|
|
|
def setpos_from_xy(self, x: int, y: int) -> None:
|
|
|
|
|
"""Set pos according to coordinates x, y"""
|
2026-04-08 23:42:26 +01:00
|
|
|
self.pos = self.layout.xy_to_pos(x, y)
|
2024-05-05 21:32:23 +02:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
def pos2xy(self) -> CursorXY:
|
2024-05-05 21:32:23 +02:00
|
|
|
"""Return the x, y coordinates of position 'pos'."""
|
2026-04-08 23:42:26 +01:00
|
|
|
assert 0 <= self.pos <= len(self.buffer)
|
|
|
|
|
return self.layout.pos_to_xy(self.pos)
|
|
|
|
|
|
|
|
|
|
def insert(self, text: str | list[str]) -> None:
|
|
|
|
|
"""Insert 'text' at the insertion point."""
|
|
|
|
|
start = self.pos
|
|
|
|
|
self.buffer[self.pos : self.pos] = list(text)
|
|
|
|
|
self.pos += len(text)
|
|
|
|
|
self.invalidate_buffer(start)
|
2025-03-21 18:27:35 +01:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
def invalidate_cursor(self) -> None:
|
|
|
|
|
self.invalidation = self.invalidation.with_cursor()
|
2025-03-21 18:27:35 +01:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
def invalidate_buffer(self, from_pos: int) -> None:
|
|
|
|
|
self.invalidation = self.invalidation.with_buffer(from_pos)
|
2025-03-21 18:27:35 +01:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
def invalidate_prompt(self) -> None:
|
|
|
|
|
self._prompt_cell_cache.clear()
|
|
|
|
|
self.invalidation = self.invalidation.with_prompt()
|
2024-05-05 21:32:23 +02:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
def invalidate_layout(self) -> None:
|
|
|
|
|
self.invalidation = self.invalidation.with_layout()
|
2024-05-31 00:49:03 -07:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
def invalidate_theme(self) -> None:
|
|
|
|
|
self._prompt_cell_cache.clear()
|
|
|
|
|
self.invalidation = self.invalidation.with_theme()
|
2025-03-21 18:27:35 +01:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
def invalidate_message(self) -> None:
|
|
|
|
|
self.invalidation = self.invalidation.with_message()
|
2024-05-05 21:32:23 +02:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
def invalidate_overlay(self) -> None:
|
|
|
|
|
self.invalidation = self.invalidation.with_overlay()
|
|
|
|
|
|
|
|
|
|
def invalidate_full(self) -> None:
|
|
|
|
|
self.invalidation = self.invalidation.with_full()
|
|
|
|
|
|
|
|
|
|
def clear_invalidation(self) -> None:
|
|
|
|
|
self.invalidation = RefreshInvalidation.empty()
|
2024-05-05 21:32:23 +02:00
|
|
|
|
|
|
|
|
def update_cursor(self) -> None:
|
|
|
|
|
"""Move the cursor to reflect changes in self.pos"""
|
|
|
|
|
self.cxy = self.pos2xy()
|
2025-05-02 20:22:31 +02:00
|
|
|
trace("update_cursor({pos}) = {cxy}", pos=self.pos, cxy=self.cxy)
|
2024-05-05 21:32:23 +02:00
|
|
|
self.console.move_cursor(*self.cxy)
|
|
|
|
|
|
|
|
|
|
def after_command(self, cmd: Command) -> None:
|
|
|
|
|
"""This function is called to allow post command cleanup."""
|
|
|
|
|
if getattr(cmd, "kills_digit_arg", True):
|
|
|
|
|
if self.arg is not None:
|
2026-04-08 23:42:26 +01:00
|
|
|
self.invalidate_prompt()
|
2024-05-05 21:32:23 +02:00
|
|
|
self.arg = None
|
|
|
|
|
|
|
|
|
|
def prepare(self) -> None:
|
|
|
|
|
"""Get ready to run. Call restore when finished. You must not
|
|
|
|
|
write to the console in between the calls to prepare and
|
|
|
|
|
restore."""
|
|
|
|
|
try:
|
|
|
|
|
self.console.prepare()
|
|
|
|
|
self.arg = None
|
|
|
|
|
self.finished = False
|
|
|
|
|
del self.buffer[:]
|
|
|
|
|
self.pos = 0
|
2026-04-08 23:42:26 +01:00
|
|
|
self.layout = LayoutMap.empty()
|
|
|
|
|
self.cxy = self.pos2xy()
|
|
|
|
|
self.lxy = (self.pos, 0)
|
|
|
|
|
self.rendered_screen = RenderedScreen.empty()
|
|
|
|
|
self.invalidate_full()
|
2024-05-05 21:32:23 +02:00
|
|
|
self.last_command = None
|
2026-04-08 23:42:26 +01:00
|
|
|
base_screen = self.calc_screen()
|
|
|
|
|
self.rendered_screen = self.compose_rendered_screen(base_screen)
|
|
|
|
|
self.invalidation = RefreshInvalidation.empty()
|
2024-05-05 21:32:23 +02:00
|
|
|
except BaseException:
|
|
|
|
|
self.restore()
|
|
|
|
|
raise
|
|
|
|
|
|
2024-05-25 17:15:54 +01:00
|
|
|
while self.scheduled_commands:
|
|
|
|
|
cmd = self.scheduled_commands.pop()
|
|
|
|
|
self.do_cmd((cmd, []))
|
|
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
def last_command_is(self, cls: CommandClass) -> bool:
|
2024-05-05 21:32:23 +02:00
|
|
|
if not self.last_command:
|
|
|
|
|
return False
|
|
|
|
|
return issubclass(cls, self.last_command)
|
|
|
|
|
|
|
|
|
|
def restore(self) -> None:
|
|
|
|
|
"""Clean up after a run."""
|
|
|
|
|
self.console.restore()
|
|
|
|
|
|
|
|
|
|
@contextmanager
|
|
|
|
|
def suspend(self) -> SimpleContextManager:
|
|
|
|
|
"""A context manager to delegate to another reader."""
|
|
|
|
|
prev_state = {f.name: getattr(self, f.name) for f in fields(self)}
|
|
|
|
|
try:
|
|
|
|
|
self.restore()
|
|
|
|
|
yield
|
|
|
|
|
finally:
|
|
|
|
|
for arg in ("msg", "ps1", "ps2", "ps3", "ps4", "paste_mode"):
|
|
|
|
|
setattr(self, arg, prev_state[arg])
|
|
|
|
|
self.prepare()
|
|
|
|
|
|
2026-01-03 15:35:34 +02:00
|
|
|
@contextmanager
|
|
|
|
|
def suspend_colorization(self) -> SimpleContextManager:
|
|
|
|
|
try:
|
|
|
|
|
old_can_colorize = self.can_colorize
|
|
|
|
|
self.can_colorize = False
|
|
|
|
|
yield
|
|
|
|
|
finally:
|
|
|
|
|
self.can_colorize = old_can_colorize
|
|
|
|
|
|
2024-05-05 21:32:23 +02:00
|
|
|
def finish(self) -> None:
|
|
|
|
|
"""Called when a command signals that we're finished."""
|
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
def error(self, msg: str = "none") -> None:
|
|
|
|
|
self.msg = "! " + msg + " "
|
2026-04-08 23:42:26 +01:00
|
|
|
self.invalidate_message()
|
2024-05-05 21:32:23 +02:00
|
|
|
self.console.beep()
|
|
|
|
|
|
|
|
|
|
def update_screen(self) -> None:
|
2026-04-08 23:42:26 +01:00
|
|
|
if self.invalidation.is_cursor_only:
|
|
|
|
|
self.update_cursor()
|
|
|
|
|
self.clear_invalidation()
|
|
|
|
|
elif self.invalidation.needs_screen_refresh:
|
2024-05-05 21:32:23 +02:00
|
|
|
self.refresh()
|
|
|
|
|
|
|
|
|
|
def refresh(self) -> None:
|
|
|
|
|
"""Recalculate and refresh the screen."""
|
2026-04-07 18:09:11 -03:00
|
|
|
self.console.height, self.console.width = self.console.getheightwidth()
|
2024-05-05 21:32:23 +02:00
|
|
|
# this call sets up self.cxy, so call it first.
|
2026-04-08 23:42:26 +01:00
|
|
|
base_screen = self.calc_screen()
|
|
|
|
|
rendered_screen = self.compose_rendered_screen(base_screen)
|
|
|
|
|
self.rendered_screen = rendered_screen
|
|
|
|
|
trace(
|
|
|
|
|
"reader.refresh cursor={cursor} lines={lines} "
|
|
|
|
|
"dims=({width},{height}) invalidation={invalidation}",
|
|
|
|
|
cursor=self.cxy,
|
|
|
|
|
lines=len(rendered_screen.composed_lines),
|
|
|
|
|
width=self.console.width,
|
|
|
|
|
height=self.console.height,
|
|
|
|
|
invalidation=self.invalidation,
|
|
|
|
|
)
|
|
|
|
|
self.console.refresh(rendered_screen)
|
|
|
|
|
self.clear_invalidation()
|
2024-05-05 21:32:23 +02:00
|
|
|
|
2026-04-08 23:42:26 +01:00
|
|
|
def do_cmd(self, cmd: CommandInput) -> None:
|
2024-05-05 21:32:23 +02:00
|
|
|
"""`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
|
|
|
|
|
of single-character strings."""
|
|
|
|
|
|
|
|
|
|
trace("received command {cmd}", cmd=cmd)
|
2024-05-07 16:31:56 +02:00
|
|
|
if isinstance(cmd[0], str):
|
|
|
|
|
command_type = self.commands.get(cmd[0], commands.invalid_command)
|
|
|
|
|
elif isinstance(cmd[0], type):
|
|
|
|
|
command_type = cmd[0]
|
|
|
|
|
else:
|
|
|
|
|
return # nothing to do
|
2024-05-05 21:32:23 +02:00
|
|
|
|
2024-05-07 16:31:56 +02:00
|
|
|
command = command_type(self, *cmd) # type: ignore[arg-type]
|
2024-05-05 21:32:23 +02:00
|
|
|
command.do()
|
|
|
|
|
|
|
|
|
|
self.after_command(command)
|
2026-04-08 23:42:26 +01:00
|
|
|
if (
|
|
|
|
|
not self.invalidation.needs_screen_refresh
|
|
|
|
|
and not self.invalidation.is_cursor_only
|
|
|
|
|
):
|
|
|
|
|
self.invalidate_cursor()
|
|
|
|
|
self.update_screen()
|
|
|
|
|
|
|
|
|
|
if command_type is not commands.digit_arg:
|
2024-05-05 21:32:23 +02:00
|
|
|
self.last_command = command_type
|
|
|
|
|
|
|
|
|
|
self.finished = bool(command.finish)
|
|
|
|
|
if self.finished:
|
|
|
|
|
self.console.finish()
|
|
|
|
|
self.finish()
|
|
|
|
|
|
2024-09-06 21:28:29 +02:00
|
|
|
def run_hooks(self) -> None:
|
|
|
|
|
threading_hook = self.threading_hook
|
|
|
|
|
if threading_hook is None and 'threading' in sys.modules:
|
|
|
|
|
from ._threading_handler import install_threading_hook
|
|
|
|
|
install_threading_hook(self)
|
|
|
|
|
if threading_hook is not None:
|
|
|
|
|
try:
|
|
|
|
|
threading_hook()
|
|
|
|
|
except Exception:
|
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
input_hook = self.console.input_hook
|
|
|
|
|
if input_hook:
|
|
|
|
|
try:
|
|
|
|
|
input_hook()
|
|
|
|
|
except Exception:
|
|
|
|
|
pass
|
|
|
|
|
|
2024-05-05 21:32:23 +02:00
|
|
|
def handle1(self, block: bool = True) -> bool:
|
|
|
|
|
"""Handle a single event. Wait as long as it takes if block
|
|
|
|
|
is true (the default), otherwise return False if no event is
|
|
|
|
|
pending."""
|
|
|
|
|
|
|
|
|
|
if self.msg:
|
|
|
|
|
self.msg = ""
|
2026-04-08 23:42:26 +01:00
|
|
|
self.invalidate_message()
|
2024-05-05 21:32:23 +02:00
|
|
|
|
|
|
|
|
while True:
|
2024-09-06 21:28:29 +02:00
|
|
|
# We use the same timeout as in readline.c: 100ms
|
|
|
|
|
self.run_hooks()
|
|
|
|
|
self.console.wait(100)
|
|
|
|
|
event = self.console.get_event(block=False)
|
|
|
|
|
if not event:
|
|
|
|
|
if block:
|
|
|
|
|
continue
|
2024-05-05 21:32:23 +02:00
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
translate = True
|
|
|
|
|
|
|
|
|
|
if event.evt == "key":
|
|
|
|
|
self.input_trans.push(event)
|
|
|
|
|
elif event.evt == "scroll":
|
2026-04-08 23:42:26 +01:00
|
|
|
self.invalidate_full()
|
2024-05-05 21:32:23 +02:00
|
|
|
self.refresh()
|
2026-04-08 23:42:26 +01:00
|
|
|
return True
|
2024-05-05 21:32:23 +02:00
|
|
|
elif event.evt == "resize":
|
2026-04-08 23:42:26 +01:00
|
|
|
self.invalidate_full()
|
2024-05-05 21:32:23 +02:00
|
|
|
self.refresh()
|
2026-04-08 23:42:26 +01:00
|
|
|
return True
|
2024-05-05 21:32:23 +02:00
|
|
|
else:
|
|
|
|
|
translate = False
|
|
|
|
|
|
|
|
|
|
if translate:
|
|
|
|
|
cmd = self.input_trans.get()
|
|
|
|
|
else:
|
|
|
|
|
cmd = [event.evt, event.data]
|
|
|
|
|
|
|
|
|
|
if cmd is None:
|
|
|
|
|
if block:
|
|
|
|
|
continue
|
2024-09-06 21:28:29 +02:00
|
|
|
return False
|
2024-05-05 21:32:23 +02:00
|
|
|
|
|
|
|
|
self.do_cmd(cmd)
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
def push_char(self, char: int | bytes) -> None:
|
|
|
|
|
self.console.push_char(char)
|
|
|
|
|
self.handle1(block=False)
|
|
|
|
|
|
|
|
|
|
def readline(self, startup_hook: Callback | None = None) -> str:
|
|
|
|
|
"""Read a line. The implementation of this method also shows
|
|
|
|
|
how to drive Reader if you want more control over the event
|
|
|
|
|
loop."""
|
|
|
|
|
self.prepare()
|
|
|
|
|
try:
|
|
|
|
|
if startup_hook is not None:
|
|
|
|
|
startup_hook()
|
|
|
|
|
self.refresh()
|
|
|
|
|
while not self.finished:
|
|
|
|
|
self.handle1()
|
|
|
|
|
return self.get_unicode()
|
|
|
|
|
|
|
|
|
|
finally:
|
|
|
|
|
self.restore()
|
|
|
|
|
|
|
|
|
|
def bind(self, spec: KeySpec, command: CommandName) -> None:
|
|
|
|
|
self.keymap = self.keymap + ((spec, command),)
|
|
|
|
|
self.input_trans = input.KeymapTranslator(
|
|
|
|
|
self.keymap, invalid_cls="invalid-key", character_cls="self-insert"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
def get_unicode(self) -> str:
|
|
|
|
|
"""Return the current buffer as a unicode string."""
|
|
|
|
|
return "".join(self.buffer)
|