Skip to content

gh-138239: Fix incorrect highlighting of "type" in type statements in the REPL. #138241

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 8 commits into from
Sep 15, 2025
Merged

gh-138239: Fix incorrect highlighting of "type" in type statements in the REPL. #138241

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d1cdda5
add "type" to soft keyword check
00ll00 Aug 29, 2025
64a443b
📜🤖 Added by blurb_it.
blurb-it[bot] Aug 29, 2025
16e6f75
Update Lib/_pyrepl/utils.py
00ll00 Aug 29, 2025
23fbfe4
Update Misc/NEWS.d/next/Library/2025-08-29-12-56-55.gh-issue-138239.u…
00ll00 Aug 29, 2025
948a0b0
*
00ll00 Aug 29, 2025
eb3f8bc
fix type statement highlight after DEDENT
00ll00 Sep 1, 2025
131a08f
add tests for type statement highlighting
00ll00 Sep 1, 2025
b881215
Merge remote-tracking branch 'upstream/main' into repl-highlight
00ll00 Sep 1, 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
6 changes: 6 additions & 0 deletions Lib/_pyrepl/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,12 @@ def is_soft_keyword_used(*tokens: TI | None) -> bool:
return True
case (TI(string="case"), TI(string="_"), TI(string=":")):
return True
case (
None | TI(T.NEWLINE) | TI(T.INDENT) | TI(string=":"),
TI(string="type"),
TI(T.NAME, string=s)
):
return not keyword.iskeyword(s)
case _:
return False

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2025-08-29-12-56-55.gh-issue-138239.uthZFI.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
The REPL now highlights :keyword:`type` as a soft keyword
in :ref:`type statements <type>`.
Loading