_pyrepl: switch console refresh to structured rendered screens#146584
Open
pablogsal wants to merge 8 commits intopython:mainfrom
Open
_pyrepl: switch console refresh to structured rendered screens#146584pablogsal wants to merge 8 commits intopython:mainfrom
pablogsal wants to merge 8 commits intopython:mainfrom
Conversation
Introduce render-cell, rendered-screen, and line-diff helpers for redraw work. Keep the new abstractions self-contained so later commits can adopt them cleanly.
Teach the reader and terminal backends to refresh from RenderedScreen objects. This isolates the redraw-planning refactor before layout and styling changes land.
Add structured prompt, content, and wrapped-row helpers for screen calculation. Move reader layout bookkeeping onto those helpers before styling changes arrive.
Thread StyleRef and styled content fragments through render and reader paths. Keep semantic color information attached to cells during redraw diffs.
Make buffer, layout, prompt, overlay, and full redraw causes explicit in Reader. The invalidation matrix is still cursed, but at least now it is visible.
Move completion and message UI onto overlays layered over the base rendered screen. The completion menu stops pretending it is the base reality.
f7c4493 to
7c26e18
Compare
Finish the refactor with prompt-cell caching, typed aliases, and layout edge-case fixes. Land the remaining render and reader regressions needed for the final shape.
Member
Author
|
Crap I activated this copilot nonsense by mistake ... |
There was a problem hiding this comment.
Pull request overview
This PR refactors _pyrepl screen refresh to operate on structured “rendered screens” (cells/lines + cursor) rather than raw string lists, with corresponding updates to console backends and tests.
Changes:
- Introduces structured rendering/layout primitives (
RenderCell/RenderLine/RenderedScreen,LayoutMap, content fragments) and updatesReaderto produce/compose them. - Rewrites Unix/Windows console
refresh()paths to diff/applyRenderedScreenupdates via explicit refresh plans. - Updates tests and ancillary behavior (e.g., control-char display escaping and history-file NUL sanitization) to match the new rendering model.
Reviewed changes
Copilot reviewed 21 out of 21 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| Lib/_pyrepl/render.py | New rendering model (cells/lines/screens), diffing, and line-update primitives. |
| Lib/_pyrepl/layout.py | New layout mapping between buffer positions and rendered rows/columns. |
| Lib/_pyrepl/content.py | New prompt/body content modeling and buffer-to-fragment conversion. |
| Lib/_pyrepl/reader.py | Major refactor: invalidation model, rendered screen composition, and layout-driven cursor mapping. |
| Lib/_pyrepl/unix_console.py | Refresh rewritten to plan/apply structured line updates; fixes raw accumulation bug. |
| Lib/_pyrepl/windows_console.py | Refresh rewritten to plan/apply structured line updates with rendered state sync. |
| Lib/_pyrepl/console.py | Console API now refreshes with RenderedScreen; adds rendered-state sync + redraw visualization. |
| Lib/_pyrepl/utils.py | Adds display-char iterator/control escaping helpers; refactors disp_str; adds StyleRef. |
| Lib/_pyrepl/types.py | Expands shared type aliases (cursor/dimensions/keymap/event data). |
| Lib/_pyrepl/trace.py | Adds trace_text() helper for safer trace output. |
| Lib/_pyrepl/readline.py | Sanitizes embedded NULs when reading history; updates overlay invalidation hooks. |
| Lib/_pyrepl/commands.py | Converts “dirty” flag usage to targeted invalidations; updates screen sync behavior. |
| Lib/_pyrepl/completing_reader.py | Moves completions menu to overlay-based composition; updates invalidations. |
| Lib/_pyrepl/historical_reader.py | Updates history operations to invalidate buffer/prompt appropriately. |
| Lib/_pyrepl/simple_interact.py | Switches interrupt path to full invalidation. |
| Lib/_pyrepl/input.py | Cleans up TYPE_CHECKING guard for type-only imports. |
| Lib/test/test_pyrepl/support.py | Test utilities updated for rendered-line equality and new console refresh signature. |
| Lib/test/test_pyrepl/test_reader.py | Adds/adjusts tests for control-byte escaping, zero-width behavior, and layout mapping. |
| Lib/test/test_pyrepl/test_unix_console.py | Adds regression test for colorized multiline typing redraw behavior. |
| Lib/test/test_pyrepl/test_windows_console.py | Updates expected cursor movement/write patterns due to new refresh diffing. |
| Lib/test/test_pyrepl/test_pyrepl.py | Adds history/NUL sanitization test and multiline history navigation behavior updates. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+422
to
+427
| source_lines = self._build_source_lines(offset, num_common_lines) | ||
| content_lines = self._build_content_lines( | ||
| source_lines, | ||
| offset, | ||
| prompt_from_cache=bool(offset and self.buffer[offset - 1] != "\n"), | ||
| ) |
There was a problem hiding this comment.
calc_screen() passes num_common_lines (which is derived from cached render/layout rows) as first_lineno into _build_source_lines(). That lineno is later passed to get_prompt(), but get_prompt() expects a logical buffer line number (based on \n count), not a rendered-row count. When the cache boundary falls mid-wrapped line (or after multi-line prompt leading rows), this can shift lineno and cause incorrect prompt selection (e.g. using ps3 where ps4 should apply). Consider computing first_lineno from the buffer (e.g. number of \n before offset) or caching a separate logical-line counter alongside line_end_offsets.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.