Skip to content

fix(diffviewer): wrap long lines through delta in side-by-side, mark clipped lines in unified (closes #99) #133

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
Booyaka101 wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −4
Open

fix(diffviewer): wrap long lines through delta in side-by-side, mark clipped lines in unified (closes #99) #133

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
21 changes: 17 additions & 4 deletions pkg/ui/panes/diffviewer/diffviewer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,15 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
}

case diffContentMsg:
// Truncate lines to viewport width to prevent ANSI escape overflow.
// Clip lines that exceed the viewport width and use a visible tail
// marker so users can see content was cut off rather than failing
// silently. In side-by-side mode delta wraps long lines for us; in
// unified mode delta passes them through as-is, so this clip-with-
// marker is the only signal that there's more to the right.
lines := strings.Split(msg.text, "\n")
for i, line := range lines {
if lipgloss.Width(line) > m.vp.Width() && m.vp.Width() > 0 {
lines[i] = ansi.Truncate(line, m.vp.Width(), "")
lines[i] = ansi.Truncate(line, m.vp.Width(), "…")
Copy link
Copy Markdown
Owner

@dlvhdr dlvhdr May 15, 2026

Choose a reason for hiding this comment

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

I would like to support horizontal scrolling. I think the ... is a nice addition to indicate you can scroll right but I would like to extend it in 2 ways:

  1. Only show it on the right when the line's visible length is greater than the viewport's width
  2. Do the same behavior for the left side

}
}
diff := strings.Join(lines, "\n")
Expand Down Expand Up @@ -304,7 +308,14 @@ func diffFile(node *cachedNode, width int, sideBySide bool) tea.Cmd {
args := []string{
"--paging=never",
fmt.Sprintf("-w=%d", width),
fmt.Sprintf("--max-line-length=%d", width),
// Disable hard truncation and let delta's own line-wrapping (active
// in side-by-side mode) carry the full line through. With
// `--max-line-length=<width>` and the default `--wrap-max-lines=2`,
// long lines were being clipped at the viewport before we saw
// them. Anything still wider than the viewport gets clipped with
// a visible "…" marker in the `diffContentMsg` handler.
"--max-line-length=0",
"--wrap-max-lines=unlimited",
}
if useSideBySide {
args = append(args, "--side-by-side")
Expand Down Expand Up @@ -340,7 +351,9 @@ func diffDir(dir *cachedNode, width int, sideBySide bool, preamble string) tea.C
fmt.Sprintf("--file-style='%s bold %s'", c, c),
fmt.Sprintf("--file-decoration-style='%s box %s'", c, c),
fmt.Sprintf("-w=%d", width),
fmt.Sprintf("--max-line-length=%d", width),
// See `diffFile` for why these are set this way.
"--max-line-length=0",
"--wrap-max-lines=unlimited",
}
if useSideBySide {
args = append(args, "--side-by-side")
Expand Down
Loading