Skip to content

gh-139246: zero-width word paste can be wrong in default repl #139254

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 4 commits into from
Oct 30, 2025
Merged

gh-139246: zero-width word paste can be wrong in default repl #139254

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30e130f
fix: zero-width word paste can be wrong in default repl
yihong0618 Sep 23, 2025
07aa4bc
fix: address comments
yihong0618 Sep 24, 2025
41d2865
apply suggestion Lib/_pyrepl/utils.py
yihong0618 Sep 24, 2025
8bde6aa
fix: apply suggestion
yihong0618 Oct 30, 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
8 changes: 8 additions & 0 deletions Lib/_pyrepl/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,14 @@ class ColorSpan(NamedTuple):
def str_width(c: str) -> int:
if ord(c) < 128:
Copy link
Contributor

@grayjk grayjk Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated to this issue but quite a few of the characters with ord < 128, do not have a display width of 1

for example, in my terminal, tab (ord 9) is 8 charaters wide

something to consider for a future PR

return 1
# gh-139246 for zero-width joiner and combining characters
if unicodedata.combining(c):
return 0
category = unicodedata.category(c)
if category == "Cf" and c != "\u00ad":
return 0
if "\u2028" <= c <= "\u2029":
Copy link
Member

@encukou encukou Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, what terminal are you using? Here (on VTE) these take up one cell.

Copy link
Contributor Author

@yihong0618 yihong0618 Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mac with kitty

Copy link
Contributor

@grayjk grayjk Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if \u2028 and \u2029 aren't consistent across terminals, could remove this condition since it is unrelated to the original issue

Copy link
Contributor Author

@yihong0618 yihong0618 Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

of course will do it

Copy link
Contributor Author

@yihong0618 yihong0618 Oct 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

return 0
w = unicodedata.east_asian_width(c)
if w in ("N", "Na", "H", "A"):
return 1
Expand Down
25 changes: 24 additions & 1 deletion Lib/test/test_pyrepl/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,31 @@

class TestUtils(TestCase):
def test_str_width(self):
characters = ['a', '1', '_', '!', '\x1a', '\u263A', '\uffb9']
characters = [
'a',
'1',
'_',
'!',
'\x1a',
'\u263A',
'\uffb9',
'\N{LATIN SMALL LETTER E WITH ACUTE}', # é
'\N{LATIN SMALL LETTER E WITH CEDILLA}', # ȩ
'\u00ad',
]
for c in characters:
self.assertEqual(str_width(c), 1)

zero_width_characters = [
'\N{COMBINING ACUTE ACCENT}',
'\N{ZERO WIDTH JOINER}',
'\u2028',
'\u2029',
]
for c in zero_width_characters:
with self.subTest(character=c):
self.assertEqual(str_width(c), 0)

characters = [chr(99989), chr(99999)]
for c in characters:
self.assertEqual(str_width(c), 2)
Expand All @@ -25,6 +46,8 @@ def test_wlen(self):

self.assertEqual(wlen('hello'), 5)
self.assertEqual(wlen('hello' + '\x1a'), 7)
self.assertEqual(wlen('e\N{COMBINING ACUTE ACCENT}'), 1)
self.assertEqual(wlen('a\N{ZERO WIDTH JOINER}b'), 2)

def test_prev_next_window(self):
def gen_normal():
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2025-09-23-09-46-46.gh-issue-139246.pzfM-w.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix: paste zero-width in default repl width is wrong.
Loading