barrett/diffs.nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(conflict): keep default virtual text labels minimal

Browse source 
Problem: default labels included keymap hints ("current — doo") which
is an anti-pattern for a vim plugin — discoverability belongs in docs
and opt-in config, not baked into the default UI.

Solution: default labels return to plain "(current)" / "(incoming)".
Keymap hints are only shown when users provide a format_virtual_text
function or enable show_actions.
This commit is contained in:
Barrett Ruth 2026-02-09 13:27:09 -05:00
parent c9e2722d19
commit 861f83600a
3 changed files with 7 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

11
doc/diffs.nvim.txt
View file

@ -444,13 +444,10 @@ Configuration: ~
diagnostics alone.
{show_virtual_text} (boolean, default: true)
Show virtual text labels at the end of
`<<<<<<<` and `>>>>>>>` marker lines.
Default labels include keymap hints:
`(current — doo)` and `(incoming — dot)`.
If a keymap is `false`, the hint is omitted.
Also controls hunk hints in merge diff
views.
Show `(current)` and `(incoming)` labels at
the end of `<<<<<<<` and `>>>>>>>` marker
lines. Also controls hunk hints in merge
diff views.
{format_virtual_text} (function|nil, default: nil)
Custom formatter for virtual text labels.