Skip to content

Conversation

@yuja
Copy link
Contributor

@yuja yuja commented Dec 11, 2025

Closes #5140

Checklist

If applicable:

  • I have updated CHANGELOG.md
  • I have updated the documentation (README.md, docs/, demos/)
  • I have updated the config schema (cli/src/config-schema.json)
  • I have added/updated tests to cover my changes

default:
image

dim context line number + text, highlight with fg/bg:
image

yuja added 2 commits December 11, 2025 22:36
Handling of dim and bold is a bit complicated because these two attributes
cannot be unset individually. I think NormalIntensity will work for resetting
both bold and dim, but I don't have expertise on terminal implementations. So
this patch applies the same workaround as bold to dim.
This will help notice small hunks in inlined diff lines. Not all terminals would
support "dim" attribute, but I think that's okay since the diff output should be
readable with/without this change.

Closes #5140
@yuja yuja requested a review from a team as a code owner December 11, 2025 13:50
@jgilchrist
Copy link
Contributor

@yuja What's the config you're using for your second screenshot?

@yuja
Copy link
Contributor Author

yuja commented Dec 12, 2025

What's the config you're using for your second screenshot?

[colors]
"diff context" = { dim = true }
"diff token" = { underline = false }
"diff added token" = { fg = "bright green", bg = "#002200" }
"diff removed token" = { fg = "bright red", bg = "#330000" }

It's basically the same as the doc example.
https://docs.jj-vcs.dev/latest/config/#diff-colors-and-styles

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

FR: Improve "diff" visibility by adding marker before line number

2 participants