Skip to content

gh-131507: Add support for syntax highlighting in PyREPL #133247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 23 commits into from
May 2, 2025
Merged

gh-131507: Add support for syntax highlighting in PyREPL #133247

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e921a80
gh-131507: Add support for syntax highlighting in PyREPL
ambv Mar 18, 2025
fb95911
Add Blurb
ambv Mar 21, 2025
b428513
Fix irrelevant Windows tests
ambv Mar 21, 2025
2bdcd06
Replace idlelib.colorizer with a faster solution
ambv Apr 29, 2025
8c70c45
Slurp the entire input buffer before refreshing display during bracke…
ambv Apr 29, 2025
4d7ae36
Implement getpending() on Windows
ambv Apr 29, 2025
9585bd6
Adapt tests
ambv Apr 29, 2025
b1f2557
Support soft keywords (fight fire with fire)
ambv Apr 30, 2025
01e1129
Fix test
ambv Apr 30, 2025
20eff49
Remove unnecessary import
ambv Apr 30, 2025
8d3648a
Add test for prev_next_window
ambv Apr 30, 2025
656fea3
Windows: bracketed pasting of 448692 chars done in 2.38s ✊
ambv May 1, 2025
dac8961
Remove colors from Windows low-level console tests
ambv May 1, 2025
7891fa7
Fix lint and stuff
ambv May 1, 2025
362a21b
Add experimental theming support for syntax highlighting and the prompt
ambv May 1, 2025
ffebbbe
Fix lint
ambv May 1, 2025
388e494
Merge branch 'main' into pyrepl-syntax-highlighting-tokens
ambv May 1, 2025
9b60382
Add t-string support to syntax highlighting
ambv May 1, 2025
f835dba
Apply suggestions from code review
ambv May 2, 2025
9003d05
Add _colorize.ANSIColors.BOLD
ambv May 2, 2025
ff1f92b
Remove - and + from first sets matching for `match`
ambv May 2, 2025
bd84cd8
Address Pablo's review
ambv May 2, 2025
080f300
Exclude applying soft keywords inside any bracket pairs, not just par…
ambv May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix test
  • Loading branch information
@ambv
ambv committed Apr 30, 2025
commit 01e1129886a1d9b55f9649abe990fea594d35d4b
8 changes: 4 additions & 4 deletions Lib/_pyrepl/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,29 +224,29 @@ def is_soft_keyword_used(*tokens: TI | None) -> bool:
trace("is_soft_keyword_used{t}", t=tokens)
match tokens:
case (
None | TI(T.INDENT) | TI(string=":"),
None | TI(T.NEWLINE) | TI(T.INDENT) | TI(string=":"),
TI(string="match"),
TI(T.NUMBER | T.STRING | T.FSTRING_START)
| TI(T.OP, string="(" | "*" | "-" | "+" | "[" | "{" | "~" | "...")
):
return True
case (
None | TI(T.INDENT) | TI(string=":"),
None | TI(T.NEWLINE) | TI(T.INDENT) | TI(string=":"),
TI(string="match"),
TI(T.NAME, string=s)
):
if keyword.iskeyword(s):
return s in keyword_first_sets_match
return True
case (
None | TI(T.INDENT) | TI(string=":"),
None | TI(T.NEWLINE) | TI(T.INDENT) | TI(string=":"),
TI(string="case"),
TI(T.NUMBER | T.STRING | T.FSTRING_START)
| TI(T.OP, string="(" | "*" | "-" | "[" | "{")
):
return True
case (
None | TI(T.INDENT) | TI(string=":"),
None | TI(T.NEWLINE) | TI(T.INDENT) | TI(string=":"),
TI(string="case"),
TI(T.NAME, string=s)
):
Expand Down
8 changes: 4 additions & 4 deletions Lib/test/test_pyrepl/test_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,19 +386,19 @@ def funct(case: str = sys.platform) -> None:
expected = dedent(
"""\
{k}import{z} re{o},{z} sys
{a}{k}def{z} {d}funct{z}{o}({z}{K}case{z}{o}:{z} {b}str{z} {o}={z} sys{o}.{z}platform{o}){z} {o}->{z} {k}None{z}{o}:{z}
{K}match{z} {o}={z} re{o}.{z}search{o}({z}
{a}{k}def{z} {d}funct{z}{o}({z}case{o}:{z} {b}str{z} {o}={z} sys{o}.{z}platform{o}){z} {o}->{z} {k}None{z}{o}:{z}
match {o}={z} re{o}.{z}search{o}({z}
{s}"(me)"{z}{o},{z}
{s}'''{z}
{s} Come on{z}
{s} Come on now{z}
{s} You know that it's time to emerge{z}
{s} '''{z}{o},{z}
{o}){z}
{K}match{z} {K}case{z}{o}:{z}
{K}match{z} case{o}:{z}
{K}case{z} {s}"emscripten"{z}{o}:{z} {b}print{z}{o}({z}{s}"on the web"{z}{o}){z}
{K}case{z} {s}"ios"{z} {o}|{z} {s}"android"{z}{o}:{z} {b}print{z}{o}({z}{s}"on the phone"{z}{o}){z}
{K}case{z} {K}_{z}{o}:{z} {b}print{z}{o}({z}{s}'arms around'{z}{o},{z} {K}match{z}{o}.{z}group{o}({z}{n}1{z}{o}){z}{o}){z}
{K}case{z} {K}_{z}{o}:{z} {b}print{z}{o}({z}{s}'arms around'{z}{o},{z} match{o}.{z}group{o}({z}{n}1{z}{o}){z}{o}){z}
"""
)
expected_sync = expected.format(a="", **colors)
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy