fix(diff): SplitDiff renders CJK without misaligning the column border#1686
Merged
Conversation
Two bugs in the same `Cell` body (#1671): - truncation used `raw.length > inner`, which undercounts wide chars — a CJK row that was visually too wide for the column slipped past the check and overflowed into the gutter - padding used `padEnd(inner)`, which counts string length not cells — short CJK content got padded as if each wide char were 1 cell, so the background-color stripe ran past the column edge Repo already has a cell-aware clipper (`clipToCells`) for the cut and a private `padToCells` in `markdown.tsx` for the pad. Promote `padToCells` to `text-width.ts` so SplitDiff can use both — collapses the original four lines (slice + ternary + padEnd + ascii comment) to a single `padToCells(clipToCells(raw, inner), inner)` and drops the duplicate definition from `markdown.tsx`. Supersedes #1683, which fixed the detection half but left the slice + padEnd in place — for CJK content the truncated string ended up wider than `inner` and short rows still over-padded. Co-authored-by: Bernardxu123 <Bernardxu123@users.noreply.github.com>
|
the pr dont closes issue? |
esengine
pushed a commit
that referenced
this pull request
May 24, 2026
…moved, persisted usage stats, plan dispatch gate Headline themes: - Desktop: bundle the CLI-hosted React dashboard, retire Tauri+Preact duplicate (#1418) - Config: drop preset abstraction; flash/pro are direct model selections (#1657, #1630) - Stats: persist cumulative usage to session meta + auto-restore on startup (#1667, #1680, #1643, #1628) - Plans: editMode="plan" enforced at the ToolRegistry dispatch gate (#1681); step advance fix (#1629) - Context: fold once at turn start, drop pre-flight + byte-ceiling (#1642, #1646); collapsible compacted card (#1649) - Subagents: per-skill flash/pro override + Settings UI (#1632) - Desktop polish: sidebar drag-resize (#1688), responsive collapse (#1585), copy/edit overlay + msg-history nav (#1645), Esc closes modal not turn (#1685), QQ tab isolation (#1672), DiffCard for edits (#1662), theme-aware highlighting (#1655), system events toggle (#1654/#1650), macOS TCC inheritance (#1614), dashboard.enabled (#1612) - Dashboard polish: persistent session URL (#1586, #1589, #1599), theme-aware highlighting (#1664), IME confirm-enter guard (#1689), code-fence lang fix (#1677), vendor chunk split (#1587), markdown table h-scroll (#1562) - TUI: Alt+S input stash/recall; static history isolated from input rerenders (#1635); legacy mouse drop (#1637, #1648); multi-edit gated in review (#1647) - Diff: SplitDiff column border holds under CJK (#1686) - MCP: workspace roots passed to servers (#1625); codeCommand honors mcpServers (#1603) - Config plumbing: (baseUrl, apiKey) resolved as a tuple (#1658); stale model id self-heal (#1663) See CHANGELOG for the full list.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Two bugs in the same
Cellbody ofSplitDiff.tsxthat misalign the diff column border when CJK / emoji are present (#1671):raw.length > inner, which undercounts wide chars — a CJK row that was visually too wide slipped past the check and overflowed into the gutterpadEnd(inner), which counts string length not visual cells — short CJK content got padded as if each wide char were 1 cell, so the red/green background stripe ran past the column edgeRepo already has
clipToCells(s, maxCells)(cell-aware truncation + ellipsis) insrc/cli/ui/text-width.ts, and a privatepadToCells(text, cells)(cell-aware right-pad) insrc/cli/ui/markdown.tsx. PromotedpadToCellstotext-width.tssoSplitDiffcan use both; the four lines aroundtruncatedcollapse topadToCells(clipToCells(raw, inner), inner).Supersedes #1683
That PR fixed the detection half (
stringWidth(raw) > inner) but left both the JS-charraw.slice(0, inner - 1)cut and thepadEnd(inner)pad in place. For CJK content the truncated string came out wider thaninnercells, and short CJK rows still over-padded — the border was still misaligned, just for slightly different inputs. Co-authored credit preserved.Test plan
npx tsc --noEmitnpx vitest run tests/text-width.test.ts— 22 passed (was 19; added apadToCellsdescribe block covering ASCII pad, CJK pad without over-padding, and the no-op-when-full case)npx vitest run tests/markdown— 28 passed (sanity-check thepadToCellsextraction from markdown.tsx)