Commit71ea6a6

authored

gh-134158: Fix PyREPL coloring of double braces in f/t-strings (gh-134159)

Co-authored-by: Loïc Simon <loic.simon@napta.io>Co-authored-by: Peter Bierma <zintensitydev@gmail.com>Co-authored-by: Łukasz Langa <lukasz@langa.pl>

1 parentb22460c commit71ea6a6Copy full SHA for 71ea6a6

File tree

+39

-1

lines changed

+39

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,15 @@ def from_re(cls, m: Match[str], group: int \| str) -> Self:`
`41`	`41`
`42`	`42`	`@classmethod`
`43`	`43`	`deffrom_token(cls,token:TI,line_len:list[int])->Self:`
	`44`	`+end_offset=-1`
	`45`	`+if (token.typein {T.FSTRING_MIDDLE,T.TSTRING_MIDDLE}`
	`46`	`+andtoken.string.endswith(("{","}"))):`
	`47`	`+# gh-134158: a visible trailing brace comes from a double brace in input`
	`48`	`+end_offset+=1`
	`49`	`+`
`44`	`50`	`returncls(`
`45`	`51`	`line_len[token.start[0]-1]+token.start[1],`
`46`		`-line_len[token.end[0]-1]+token.end[1]-1,`
	`52`	`+line_len[token.end[0]-1]+token.end[1]+end_offset,`
`47`	`53`	`)`
`48`	`54`
`49`	`55`

Lines changed: 31 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -517,6 +517,37 @@ def unfinished_function():`
`517`	`517`	`self.assert_screen_equal(reader,code,clean=True)`
`518`	`518`	`self.assert_screen_equal(reader,expected)`
`519`	`519`
	`520`	`+deftest_syntax_highlighting_literal_brace_in_fstring_or_tstring(self):`
	`521`	`+code=dedent(`
	`522`	`+"""\`
	`523`	`+ f"{{"`
	`524`	`+ f"}}"`
	`525`	`+ f"a{{b"`
	`526`	`+ f"a}}b"`
	`527`	`+ f"a{{b}}c"`
	`528`	`+ t"a{{b}}c"`
	`529`	`+ f"{{{0}}}"`
	`530`	`+ f"{ {0} }"`
	`531`	`+ """`
	`532`	`+ )`
	`533`	`+expected=dedent(`
	`534`	`+"""\`
	`535`	`+ {s}f"{z}{s}<<{z}{s}"{z}`
	`536`	`+ {s}f"{z}{s}>>{z}{s}"{z}`
	`537`	`+ {s}f"{z}{s}a<<{z}{s}b{z}{s}"{z}`
	`538`	`+ {s}f"{z}{s}a>>{z}{s}b{z}{s}"{z}`
	`539`	`+ {s}f"{z}{s}a<<{z}{s}b>>{z}{s}c{z}{s}"{z}`
	`540`	`+ {s}t"{z}{s}a<<{z}{s}b>>{z}{s}c{z}{s}"{z}`
	`541`	`+ {s}f"{z}{s}<<{z}{o}<{z}{n}0{z}{o}>{z}{s}>>{z}{s}"{z}`
	`542`	`+ {s}f"{z}{o}<{z} {o}<{z}{n}0{z}{o}>{z} {o}>{z}{s}"{z}`
	`543`	`+ """`
	`544`	`+ ).format(**colors).replace("<","{").replace(">","}")`
	`545`	`+events=code_to_events(code)`
	`546`	`+reader,_=handle_all_events(events)`
	`547`	`+self.assert_screen_equal(reader,code,clean=True)`
	`548`	`+self.maxDiff=None`
	`549`	`+self.assert_screen_equal(reader,expected)`
	`550`	`+`
`520`	`551`	`deftest_control_characters(self):`
`521`	`552`	`code='flag = "🏳️‍🌈"'`
`522`	`553`	`events=code_to_events(code)`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix coloring of double braces in f-strings and t-strings in the:term:`REPL`.

Comments

(0)