Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-25 18:54:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-136801: Fix PyREPL syntax highlightning on match cases after multi-line case (GH-136804)

Browse source
This commit is contained in:
Olga Matoula 2025-07-19 14:15:49 +01:00 • committed by GitHub
parent 6a1c93af80
commit 3a64844533
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/_pyrepl/utils.py
View file

@ -241,14 +241,14 @@ def is_soft_keyword_used(*tokens: TI | None) -> bool:
return s in keyword_first_sets_match return s in keyword_first_sets_match
return True return True
case ( case (
None | TI(T.NEWLINE) | TI(T.INDENT) | TI(string=":"), None | TI(T.NEWLINE) | TI(T.INDENT) | TI(T.DEDENT) | TI(string=":"),
TI(string="case"), TI(string="case"),
TI(T.NUMBER | T.STRING | T.FSTRING_START | T.TSTRING_START) TI(T.NUMBER | T.STRING | T.FSTRING_START | T.TSTRING_START)
| TI(T.OP, string="(" | "*" | "-" | "[" | "{") | TI(T.OP, string="(" | "*" | "-" | "[" | "{")
): ):
return True return True
case ( case (
None | TI(T.NEWLINE) | TI(T.INDENT) | TI(string=":"), None | TI(T.NEWLINE) | TI(T.INDENT) | TI(T.DEDENT) | TI(string=":"),
TI(string="case"), TI(string="case"),
TI(T.NAME, string=s) TI(T.NAME, string=s)
): ):

12
Lib/test/test_pyrepl/test_reader.py
View file

@ -375,7 +375,8 @@ def funct(case: str = sys.platform) -> None:
) )
match case: match case:
case "emscripten": print("on the web") case "emscripten": print("on the web")
case "ios" | "android": print("on the phone") case "ios" | "android":
print("on the phone")
case _: print('arms around', match.group(1)) case _: print('arms around', match.group(1))
""" """
) )
@ -393,7 +394,8 @@ def funct(case: str = sys.platform) -> None:
{o}){z} {o}){z}
{K}match{z} case{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}"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} {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} match{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}
""" """
) )
@ -402,14 +404,14 @@ def funct(case: str = sys.platform) -> None:
reader, _ = handle_all_events(events) reader, _ = handle_all_events(events)
self.assert_screen_equal(reader, code, clean=True) self.assert_screen_equal(reader, code, clean=True)
self.assert_screen_equal(reader, expected_sync) self.assert_screen_equal(reader, expected_sync)
self.assertEqual(reader.pos, 2**7 + 2**8) self.assertEqual(reader.pos, 396)
self.assertEqual(reader.cxy, (0, 14)) self.assertEqual(reader.cxy, (0, 15))
async_msg = "{k}async{z} ".format(**colors) async_msg = "{k}async{z} ".format(**colors)
expected_async = expected.format(a=async_msg, **colors) expected_async = expected.format(a=async_msg, **colors)
more_events = itertools.chain( more_events = itertools.chain(
code_to_events(code), code_to_events(code),
[Event(evt="key", data="up", raw=bytearray(b"\x1bOA"))] * 13, [Event(evt="key", data="up", raw=bytearray(b"\x1bOA"))] * 14,
code_to_events("async "), code_to_events("async "),
) )
reader, _ = handle_all_events(more_events) reader, _ = handle_all_events(more_events)

1
Misc/NEWS.d/next/Core_and_Builtins/2025-07-19-12-37-05.gh-issue-136801.XU_tF2.rst Normal file
View file

@ -0,0 +1 @@
Fix PyREPL syntax highlightning on match cases after multi-line case. Contributed by Olga Matoula.