Commit4e6dba0

and

authored

gh-139246: zero-width word paste can be wrong in default repl (GH-139254)

Signed-off-by: yihong0618 <zouzou0208@gmail.com>Co-authored-by: grayjk <grayjk@gmail.com>

1 parenta3ce2f7 commit4e6dba0Copy full SHA for 4e6dba0

File tree

+29

-1

lines changed

+29

-1

lines changed

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,12 @@ class ColorSpan(NamedTuple):`
`63`	`63`	`defstr_width(c:str)->int:`
`64`	`64`	`iford(c)<128:`
`65`	`65`	`return1`
	`66`	`+# gh-139246 for zero-width joiner and combining characters`
	`67`	`+ifunicodedata.combining(c):`
	`68`	`+return0`
	`69`	`+category=unicodedata.category(c)`
	`70`	`+ifcategory=="Cf"andc!="\u00ad":`
	`71`	`+return0`
`66`	`72`	`w=unicodedata.east_asian_width(c)`
`67`	`73`	`ifwin ("N","Na","H","A"):`
`68`	`74`	`return1`

Lines changed: 22 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,29 @@`
`5`	`5`
`6`	`6`	`classTestUtils(TestCase):`
`7`	`7`	`deftest_str_width(self):`
`8`		`-characters= ['a','1','_','!','\x1a','\u263A','\uffb9']`
	`8`	`+characters= [`
	`9`	`+'a',`
	`10`	`+'1',`
	`11`	`+'_',`
	`12`	`+'!',`
	`13`	`+'\x1a',`
	`14`	`+'\u263A',`
	`15`	`+'\uffb9',`
	`16`	`+'\N{LATIN SMALL LETTER E WITH ACUTE}',# é`
	`17`	`+'\N{LATIN SMALL LETTER E WITH CEDILLA}',# ȩ`
	`18`	`+'\u00ad',`
	`19`	`+ ]`
`9`	`20`	`forcincharacters:`
`10`	`21`	`self.assertEqual(str_width(c),1)`
`11`	`22`
	`23`	`+zero_width_characters= [`
	`24`	`+'\N{COMBINING ACUTE ACCENT}',`
	`25`	`+'\N{ZERO WIDTH JOINER}',`
	`26`	`+ ]`
	`27`	`+forcinzero_width_characters:`
	`28`	`+withself.subTest(character=c):`
	`29`	`+self.assertEqual(str_width(c),0)`
	`30`	`+`
`12`	`31`	`characters= [chr(99989),chr(99999)]`
`13`	`32`	`forcincharacters:`
`14`	`33`	`self.assertEqual(str_width(c),2)`
`@@ -25,6 +44,8 @@ def test_wlen(self):`
`25`	`44`
`26`	`45`	`self.assertEqual(wlen('hello'),5)`
`27`	`46`	`self.assertEqual(wlen('hello'+'\x1a'),7)`
	`47`	`+self.assertEqual(wlen('e\N{COMBINING ACUTE ACCENT}'),1)`
	`48`	`+self.assertEqual(wlen('a\N{ZERO WIDTH JOINER}b'),2)`
`28`	`49`
`29`	`50`	`deftest_prev_next_window(self):`
`30`	`51`	`defgen_normal():`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+fix: paste zero-width in default repl width is wrong.`

Comments

(0)