Fix line numbers showing filename when hyperlinks enabled by tsvikas · Pull Request #2058 · dandavison/delta

tsvikas · 2025-11-18T15:23:00Z

Summary

Fix bug where right-side line numbers display the filename instead of the line number when hyperlinks are enabled but the absolute path cannot be resolved (e.g., in --show-themes context)

The bug was introduced in commit 3d5b685 (#939) where the fallback None => file.to_owned() should have been None => pad(n).

Fixes #1887

🤖 Generated with Claude Code

When hyperlinks are enabled but the absolute path cannot be resolved (e.g., in --show-themes context), fall back to displaying the formatted line number instead of incorrectly showing the filename. Fixes #1887 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>

tsvikas · 2025-11-18T15:25:20Z

compare output of delta --show-themes before:

• src/compiler/codegen/index.js:409: function genScopedSlots (
────────────────────────────────────────────────────────────────────────────────
 409⋮src/compiler/codegen/index.js│    .join(',')
 410⋮src/compiler/codegen/index.js│
 411⋮src/compiler/codegen/index.js│  return `scopedSlots:_u([${generatedSlots}]${
 412⋮    │    needsForceUpdate ? `,true` : ``
    ⋮src/compiler/codegen/index.js│    needsForceUpdate ? `,null,true` : ``
 413⋮src/compiler/codegen/index.js│  }${
 414⋮    │    !needsForceUpdate && needsKey ? `,false,${hash(generatedSlots)}` : ``
    ⋮src/compiler/codegen/index.js│    !needsForceUpdate && needsKey ? `,null,false,${hash(generatedSlots)}` : ``
 415⋮src/compiler/codegen/index.js│  })`
 416⋮src/compiler/codegen/index.js│}
 417⋮src/compiler/codegen/index.js│

and after:

• src/compiler/codegen/index.js:409: function genScopedSlots (
────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
 409⋮ 409│    .join(',')
 410⋮ 410│
 411⋮ 411│  return `scopedSlots:_u([${generatedSlots}]${
 412⋮    │    needsForceUpdate ? `,true` : ``
    ⋮ 412│    needsForceUpdate ? `,null,true` : ``
 413⋮ 413│  }${
 414⋮    │    !needsForceUpdate && needsKey ? `,false,${hash(generatedSlots)}` : ``
    ⋮ 414│    !needsForceUpdate && needsKey ? `,null,false,${hash(generatedSlots)}` : ``
 415⋮ 415│  })`
 416⋮ 416│}
 417⋮ 417│

tsvikas · 2025-11-18T15:26:50Z

@dandavison Any chance you could approve the CI tests to run for this PR?
Thanks!

tsvikas · 2025-11-25T13:43:53Z

Hi. Friendly ping on this small PR! It's a one-line fix for #1887, and make the output of a delta --show-themes usable. Tests passing. Let me know if you need anything changed.

dandavison · 2025-11-25T19:16:51Z

Hi @tsvikas, thanks for this! I'll be honest -- I'm being slow here because I tried to repro it to confirm, but delta --show-themes seems to be broken for me, and I haven't looked into why:

$ delta --no-gitconfig --show-themes
--light and --dark cannot be used together.

tsvikas · 2025-11-25T20:44:38Z

Thanks for looking at this!

I tried to reproduce the issue myself and found that:

--no-gitconfig is sometimes being ignored - for example, when I used --show-themes --no-gitconfig with config settings present, they still affected the output.
I was able to reproduce the "light and dark cannot be used together" error when using light = true in gitconfig and running --show-themes, so there's definitely a bug there with how --show-themes interacts with these config options.

Those issues are separate from this PR's scope though.

My suggestion to reproduce: Try temporarily removing any dark or light settings from your gitconfig (i.e. ~/.gitconfig, .git/config, or system-level config) and see if --show-themes works then.

Hopefully this PR fixes the line number display bug (#1887) without making the config situation worse.

dandavison · 2025-11-25T21:34:19Z

Yes, this commit looks good -- thanks for spotting and fixing the bug!

tsvikas · 2025-11-25T22:58:58Z

my pleasure! thanks for the good work!
now i'm just waiting for the next release (hopefully soon) :)

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [dandavison/delta](https://github.com/dandavison/delta) | minor | `0.18.2` → `0.19.1` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>dandavison/delta (dandavison/delta)</summary> ### [`v0.19.1`](https://github.com/dandavison/delta/releases/tag/0.19.1) [Compare Source](dandavison/delta@0.19.0...0.19.1) This patch release fixes a release automation [bug](dandavison/delta#2127): release [0.19.0](https://github.com/dandavison/delta/releases/tag/0.19.0) did not include all release binaries. #### What's Changed - Fix CD: replace defunct ubuntu-20.04 runners by [@dandavison](https://github.com/dandavison) in [#2129](dandavison/delta#2129) **Full Changelog**: <dandavison/delta@0.19.0...0.19.1> ### [`v0.19.0`](https://github.com/dandavison/delta/releases/tag/0.19.0) [Compare Source](dandavison/delta@0.18.2...0.19.0) Tons of improvements; thanks very much to all delta contributors. **This release is missing several binaries due to a [bug in the GitHub Actions release workflow](dandavison/delta#2127). Please use <https://github.com/dandavison/delta/releases/tag/0.19.1> instead.** #### What's Changed - Do not double panic in FakeParentArgs::drop by [@dvermd](https://github.com/dvermd) in [#1856](dandavison/delta#1856) - Improve blame file type detection ([#1803](dandavison/delta#1803)) by [@dvermd](https://github.com/dvermd) in [#1829](dandavison/delta#1829) - Use same example config in manual as README by [@dandavison](https://github.com/dandavison) in [#1879](dandavison/delta#1879) - Clarify grep highlighter-related code by [@dandavison](https://github.com/dandavison) in [#1877](dandavison/delta#1877) - Don't set colorMoved in introductory instructions by [@dandavison](https://github.com/dandavison) in [#1884](dandavison/delta#1884) - Recommend zdiff3 merge.conflictStyle by [@adamchainz](https://github.com/adamchainz) in [#1260](dandavison/delta#1260) - Add themes `weeping-willow`, `mirthful-willow` by [@lvdh](https://github.com/lvdh) in [#1864](dandavison/delta#1864) - CI: switch to macos-13, as 12 will be unsupported soon by [@th1000s](https://github.com/th1000s) in [#1890](dandavison/delta#1890) - Add optional capture-output writer to run\_app() by [@th1000s](https://github.com/th1000s) in [#1889](dandavison/delta#1889) - Center-align README content by [@dandavison](https://github.com/dandavison) in [#1893](dandavison/delta#1893) - Redundant Option Checks, Unwrap Safety by [@sharma-shray](https://github.com/sharma-shray) in [#1892](dandavison/delta#1892) - Add console commands for git configuration by [@harmtemolder](https://github.com/harmtemolder) in [#1896](dandavison/delta#1896) - Honor pager path when checking less version by [@dandavison](https://github.com/dandavison) in [#1903](dandavison/delta#1903) - Rename some variables by [@dandavison](https://github.com/dandavison) in [#1904](dandavison/delta#1904) - Delete now-unused pricate homebrew formula step from Makefile (III) by [@dvermd](https://github.com/dvermd) in [#1830](dandavison/delta#1830) - Support {host} in hyperlinks by [@dandavison](https://github.com/dandavison) in [#1901](dandavison/delta#1901) - Allow multiple hyperlinks per line by [@th1000s](https://github.com/th1000s) in [#1909](dandavison/delta#1909) - Clippy 1.83 by [@th1000s](https://github.com/th1000s) in [#1918](dandavison/delta#1918) - Support external subcommands: rg, diff, git-show (etc.) by [@th1000s](https://github.com/th1000s) in [#1769](dandavison/delta#1769) - Don't keep subcommand stdout around by [@th1000s](https://github.com/th1000s) in [#1920](dandavison/delta#1920) - hyperlink commit hashes of length 7 as well by [@th1000s](https://github.com/th1000s) in [#1924](dandavison/delta#1924) - clippy 1.84 fix by [@th1000s](https://github.com/th1000s) in [#1938](dandavison/delta#1938) - chore(deps): update git2 to use libgit2 1.9 by [@chenrui333](https://github.com/chenrui333) in [#1930](dandavison/delta#1930) - Suggest minimum bat version in manual by [@ernstki](https://github.com/ernstki) in [#1941](dandavison/delta#1941) - Upgrade unicode-width to v0.1.14 (but still < 0.2.0) by [@th1000s](https://github.com/th1000s) in [#1937](dandavison/delta#1937) - Update terminal-colorsaurus version to 0.4.8 by [@rashil2000](https://github.com/rashil2000) in [#1936](dandavison/delta#1936) - Fix index out of bounds crash for '@@ @@' hunk header by [@adamchainz](https://github.com/adamchainz) in [#1995](dandavison/delta#1995) - Tune themes weeping-willow, mirthful-willow by [@lvdh](https://github.com/lvdh) in [#2011](dandavison/delta#2011) - clippy 1.88 fixes by [@injust](https://github.com/injust) in [#2016](dandavison/delta#2016) - Fix diff output when a diff ends with a mode change by [@th1000s](https://github.com/th1000s) in [#2023](dandavison/delta#2023) - fix: `cargo install git-delta --locked` fails on systems with GCC 15 by [@tquin](https://github.com/tquin) in [#2007](dandavison/delta#2007) - Normalize `merge.conflictStyle` casing by [@injust](https://github.com/injust) in [#2015](dandavison/delta#2015) - Styled zero lines fix by [@th1000s](https://github.com/th1000s) in [#1916](dandavison/delta#1916) - config: add setup instructions for Jujutsu (jj) vcs by [@arjunmahishi](https://github.com/arjunmahishi) in [#2048](dandavison/delta#2048) - all: fix clippy complaints by [@charlievieth](https://github.com/charlievieth) in [#2038](dandavison/delta#2038) - Cache the Git remote URL to speed up rendering hyperlinks by [@charlievieth](https://github.com/charlievieth) in [#1940](dandavison/delta#1940) - deps: update cc by [@ognevny](https://github.com/ognevny) in [#2053](dandavison/delta#2053) - rg json handling: fix line comment highlighting by [@th1000s](https://github.com/th1000s) in [#2057](dandavison/delta#2057) - Update dirs dependency to version 6 by [@musicinmybrain](https://github.com/musicinmybrain) in [#2063](dandavison/delta#2063) - default line number to 1 for hyperlinks by [@schpet](https://github.com/schpet) in [#2061](dandavison/delta#2061) - Fix line numbers showing filename when hyperlinks enabled by [@tsvikas](https://github.com/tsvikas) in [#2058](dandavison/delta#2058) - less hist file: look at xdg paths by [@th1000s](https://github.com/th1000s) in [#2065](dandavison/delta#2065) - CI: remove x86 apple/macOS by [@th1000s](https://github.com/th1000s) in [#2074](dandavison/delta#2074) - Update bat dependency from 0.24 to 0.26 by [@dandavison](https://github.com/dandavison) in [#2115](dandavison/delta#2115) #### New Contributors - [@dvermd](https://github.com/dvermd) made their first contribution in [#1856](dandavison/delta#1856) - [@lvdh](https://github.com/lvdh) made their first contribution in [#1864](dandavison/delta#1864) - [@sharma-shray](https://github.com/sharma-shray) made their first contribution in [#1892](dandavison/delta#1892) - [@harmtemolder](https://github.com/harmtemolder) made their first contribution in [#1896](dandavison/delta#1896) - [@ernstki](https://github.com/ernstki) made their first contribution in [#1941](dandavison/delta#1941) - [@tquin](https://github.com/tquin) made their first contribution in [#2007](dandavison/delta#2007) - [@arjunmahishi](https://github.com/arjunmahishi) made their first contribution in [#2048](dandavison/delta#2048) - [@charlievieth](https://github.com/charlievieth) made their first contribution in [#2038](dandavison/delta#2038) - [@ognevny](https://github.com/ognevny) made their first contribution in [#2053](dandavison/delta#2053) - [@musicinmybrain](https://github.com/musicinmybrain) made their first contribution in [#2063](dandavison/delta#2063) - [@schpet](https://github.com/schpet) made their first contribution in [#2061](dandavison/delta#2061) - [@tsvikas](https://github.com/tsvikas) made their first contribution in [#2058](dandavison/delta#2058) **Full Changelog**: <dandavison/delta@0.18.2...0.19.0> </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

dandavison merged commit a7b14ea into dandavison:main Nov 25, 2025
13 checks passed

tsvikas deleted the fix-show-themes-line-numbers branch November 25, 2025 22:55

BrewTestBot mentioned this pull request Mar 20, 2026

git-delta 0.19.0 Homebrew/homebrew-core#273329

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix line numbers showing filename when hyperlinks enabled#2058

Fix line numbers showing filename when hyperlinks enabled#2058
dandavison merged 1 commit into
dandavison:mainfrom
tsvikas:fix-show-themes-line-numbers

tsvikas commented Nov 18, 2025

Uh oh!

tsvikas commented Nov 18, 2025

Uh oh!

tsvikas commented Nov 18, 2025

Uh oh!

tsvikas commented Nov 25, 2025

Uh oh!

dandavison commented Nov 25, 2025

Uh oh!

tsvikas commented Nov 25, 2025 •

edited

Loading

Uh oh!

Uh oh!

dandavison commented Nov 25, 2025

Uh oh!

tsvikas commented Nov 25, 2025 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

tsvikas commented Nov 18, 2025

Summary

Uh oh!

tsvikas commented Nov 18, 2025

Uh oh!

tsvikas commented Nov 18, 2025

Uh oh!

tsvikas commented Nov 25, 2025

Uh oh!

dandavison commented Nov 25, 2025

Uh oh!

tsvikas commented Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

dandavison commented Nov 25, 2025

Uh oh!

tsvikas commented Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

tsvikas commented Nov 25, 2025 •

edited

Loading

tsvikas commented Nov 25, 2025 •

edited

Loading