Skip to content

Fix Segment._split_cells for non-unit-width characters (emoji, CJK) #4118

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

Open
ShiLiguo123 wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −23
Open

Fix Segment._split_cells for non-unit-width characters (emoji, CJK) #4118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 16 additions & 23 deletions rich/segment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,32 +126,25 @@ def _split_cells(cls, segment: "Segment", cut: int) -> Tuple["Segment", "Segment

cell_size = get_character_cell_size

pos = int((cut / cell_length) * len(text))

while True:
before = text[:pos]
cell_pos = cell_len(before)
out_by = cell_pos - cut
if not out_by:
return (
_Segment(before, style, control),
_Segment(text[pos:], style, control),
)
if out_by == -1 and cell_size(text[pos]) == 2:
# Walk through characters tracking cell position,
# avoids the heuristic + while-loop which fails on
# non-unit-width characters (emoji, CJK, etc.)
cell_pos = 0
for i, char in enumerate(text):
char_cells = cell_size(char)
if cell_pos + char_cells > cut:
if char_cells == 2:
return (
_Segment(text[:i] + " ", style, control),
_Segment(" " + text[i + 1 :], style, control),
)
return (
_Segment(text[:pos] + " ", style, control),
_Segment(" " + text[pos + 1 :], style, control),
_Segment(text[:i], style, control),
_Segment(text[i:], style, control),
)
if out_by == +1 and cell_size(text[pos - 1]) == 2:
return (
_Segment(text[: pos - 1] + " ", style, control),
_Segment(" " + text[pos:], style, control),
)
if cell_pos < cut:
pos += 1
else:
pos -= 1
cell_pos += char_cells

return segment, _Segment("", style, control)
def split_cells(self, cut: int) -> Tuple["Segment", "Segment"]:
"""Split segment in to two segments at the specified column.

Expand Down