diffs.nvim

barrett/diffs.nvim

Fork 0

Commit graph

d7ee488ef3

refactor(highlight): unified per-line extmark builder in highlight_hunk Barrett Ruth 2026-03-04 13:16:28 -05:00
749a21ae3c

fix: clear stale gutter extmarks after fugitive section toggle (#139) Barrett Ruth 2026-02-25 13:20:59 -05:00
3ee972a6ed

ci: fix typing fix/stale-gutter-extmarks Barrett Ruth 2026-02-25 13:20:02 -05:00
330b3fdc28 fix: clear stale gutter extmarks after fugitive section toggle Barrett Ruth 2026-02-25 13:16:26 -05:00
6040c054cb

fix: carry forward highlighted hunks on reparse to reduce flicker (#138) Barrett Ruth 2026-02-25 12:44:57 -05:00
2ab17a05d8 fix: carry forward highlighted hunks on reparse to reduce flicker fix/hunk-stability-toggle Barrett Ruth 2026-02-25 12:40:40 -05:00
d45ffd279b

add back hard-code override (#136) Barrett Ruth 2026-02-25 11:47:25 -05:00
d797833341

test: add decoration provider, integration, and neogit spec files (#134) Barrett Ruth 2026-02-25 11:44:56 -05:00
9ab4cf3805

fix(neogit): add patch back in feat/neogit-apis Barrett Ruth 2026-02-25 11:43:45 -05:00
2feb8a86ed

feat(neogit): use new neogit apis for highlight and repo root (#133) Barrett Ruth 2026-02-25 11:42:59 -05:00
e88f96b2be

test: add decoration provider, integration, and neogit spec files test/better-specs Barrett Ruth 2026-02-25 10:22:43 -05:00
4e11858c6e

feat(neogit): use new neogit apis for highlight and repo root Barrett Ruth 2026-02-25 10:22:33 -05:00
700a9a21ad

fix(conflict)!: change default nav keymaps from ]x/[x to ]c/[c (#132) Barrett Ruth 2026-02-24 12:07:54 -05:00
bfd3a40c5f

ci: add bit luajit global Barrett Ruth 2026-02-23 18:18:30 -05:00
5946b40491

ci: migrate to nix Barrett Ruth 2026-02-23 18:14:05 -05:00
ebc65d1f8e

build(flake): add lua-language-server to devShell Barrett Ruth 2026-02-23 17:35:22 -05:00
dfebc68a1f

fix(doc): improve q&a format Barrett Ruth 2026-02-21 23:02:39 -05:00
b1abfe4f4a

feat: remove config deprecation in v0.3.0 (#129) Barrett Ruth 2026-02-18 13:34:43 -05:00
d68cddb1a4

fix(parser): exclude git diff metadata from neogit filename patterns (#127) Barrett Ruth 2026-02-16 00:14:27 -05:00
cbc93f9eaa

refactor: remove enabled field from fugitive/neogit config (#126) Barrett Ruth 2026-02-15 19:42:38 -05:00
a00993820f

docs: add lazy.nvim installation FAQ (#125) Barrett Ruth 2026-02-15 18:55:54 -05:00
028ba5314e

fix(highlight): revert line backgrounds to hl_group+hl_eol (#124) Barrett Ruth 2026-02-15 18:27:39 -05:00
cb38865b96

fix: warn users when fugitive/neogit/diff integrations are unconfigured (#123) Barrett Ruth 2026-02-15 16:48:19 -05:00
3d640c207b

feat: add neogit support (#117) Barrett Ruth 2026-02-14 17:12:01 -05:00
5d3bbc3631

fix(ci): styling Barrett Ruth 2026-02-12 18:10:33 -05:00
3990014a93

feat: add support for diff and other filetypes Barrett Ruth 2026-02-12 18:04:47 -05:00
9a0b812f69

performance improvements (#116) Barrett Ruth 2026-02-12 16:59:13 -05:00
330e2bc9b8

feat: highlight commit buffers (#112) Barrett Ruth 2026-02-11 12:14:28 -05:00
4ce1e1786a

Update README.md Barrett Ruth 2026-02-09 20:39:38 -05:00
eb4b7f1a0b

Update README.md Barrett Ruth 2026-02-09 19:51:29 -05:00
18405ddbfa

Update README.md Barrett Ruth 2026-02-09 19:45:17 -05:00
bae6707c51

Update README.md Barrett Ruth 2026-02-09 19:43:42 -05:00
5c7e7f4bda

doc: readme video preview (#107) v0.2.2 Barrett Ruth 2026-02-09 19:40:18 -05:00
aaf7b0316a feat(doc): readme preview doc/readme-preview Barrett Ruth 2026-02-09 19:37:45 -05:00
cc5a368838

fix(highlight): support combined diff format for unmerged files (#106) v0.2.1 Barrett Ruth 2026-02-09 19:30:13 -05:00
a6dd0503b3 fix(highlight): support combined diff format for unmerged files fix/combined-diff Barrett Ruth 2026-02-09 17:03:17 -05:00
59fcf14817

Docs/readme vscode diff (#104) v0.2.0 Barrett Ruth 2026-02-09 16:34:15 -05:00
74b759cb5f docs: minor phraing docs/readme-vscode-diff Barrett Ruth 2026-02-09 15:18:05 -05:00
2d7d26a1bc

docs(readme): mention vscode-diff algorithm and credit @esmuellert (#103) Barrett Ruth 2026-02-09 15:15:42 -05:00
a666204d93 docs(readme): mention vscode-diff algorithm and credit @esmuellert Barrett Ruth 2026-02-09 15:14:37 -05:00
35067151e4

fix: pre-release cleanup for v0.2.0 (#102) Barrett Ruth 2026-02-09 15:08:36 -05:00
b5d28e9f2b

feat(conflict): add virtual text formatting and action lines (#101) Barrett Ruth 2026-02-09 13:55:13 -05:00
e40bc055b4 fix(merge): clear resolved state on buffer re-read fix/pre-release-cleanup Barrett Ruth 2026-02-09 13:54:52 -05:00
910be50201 fix(merge): notify on navigation wrap-around Barrett Ruth 2026-02-09 13:54:03 -05:00
946724096f fix(conflict): notify on navigation wrap-around Barrett Ruth 2026-02-09 13:53:23 -05:00
603c966c71 fix(fugitive): handle git-quoted filenames in status buffer Barrett Ruth 2026-02-09 13:53:02 -05:00
2834b588f1 docs: trim readme features list feat/conflict-ui Barrett Ruth 2026-02-09 13:36:56 -05:00
861f83600a refactor(conflict): keep default virtual text labels minimal Barrett Ruth 2026-02-09 13:27:09 -05:00
c9e2722d19

Merge branch 'main' into feat/conflict-ui Barrett Ruth 2026-02-09 13:24:51 -05:00
6e1a053bc4 feat(conflict): add virtual text formatting and action lines Barrett Ruth 2026-02-09 13:05:37 -05:00
f5a090baae

perf: cache repo root and harden async paths (#100) Barrett Ruth 2026-02-09 12:39:13 -05:00
3c3b27a2cb perf: cache repo root and harden async paths perf/cleanup Barrett Ruth 2026-02-09 12:36:51 -05:00
a2053a132b

feat: unified diff conflict resolution for unmerged files (#99) Barrett Ruth 2026-02-09 12:21:13 -05:00
09442f2e19 fix(commands): replace combined diffs with ours-vs-theirs for unmerged files feat/merge-diff Barrett Ruth 2026-02-08 19:28:12 -06:00
8bf6dd7b2e test(commands): add filter_combined_diffs tests Barrett Ruth 2026-02-08 18:26:46 -05:00
93ee38db8c fix(commands): filter combined diffs from section output Barrett Ruth 2026-02-08 18:22:33 -05:00
92209721c8 fix: remove unused function and import flagged by selene Barrett Ruth 2026-02-08 18:00:22 -05:00
adf3703f04 docs: add unmerged diff resolution to vimdoc Barrett Ruth 2026-02-08 17:49:23 -05:00
8716fb7d58 test(merge): add merge module tests Barrett Ruth 2026-02-08 17:49:09 -05:00
7781904d65 feat: add unified diff conflict resolution for unmerged files Barrett Ruth 2026-02-08 17:48:15 -05:00
d411ce0638 refactor(conflict): export replace_region and refresh Barrett Ruth 2026-02-08 17:46:16 -05:00
a20555667e refactor(fugitive): return status character from parse_file_line Barrett Ruth 2026-02-08 17:45:51 -05:00
49fc446aae

doc: add plug mappings for merge conflict resolution (#98) Barrett Ruth 2026-02-08 16:29:39 -05:00
f3a72926d2 doc: add plug mappings for merge conflict resolution doc/merge-conflicts Barrett Ruth 2026-02-08 16:28:18 -05:00
669cca53ae

Merge pull request #96 from barrettruth/feat/conflict Barrett Ruth 2026-02-08 15:23:30 -05:00
a192830d8c fix(conflict): clear stale diagnostics before re-enabling Barrett Ruth 2026-02-07 19:47:32 -05:00
35cb13419c fix(conflict): keep TextChanged autocmd alive after resolution Barrett Ruth 2026-02-07 19:42:29 -05:00
bae86c5fd9 feat(conflict): show branch names in virtual text labels Barrett Ruth 2026-02-07 17:57:53 -05:00
238df23ee0 feat(conflict): show branch names in virtual text labels feat/conflict Barrett Ruth 2026-02-07 17:57:53 -05:00
1108c33526 refactor(conflict): drop unnecessary @as cast in parser Barrett Ruth 2026-02-07 17:52:35 -05:00
98a1a4028b fix(conflict): resolve LuaLS missing-fields diagnostics Barrett Ruth 2026-02-07 17:51:47 -05:00
7ae867c413 fix(conflict): resolve LuaLS duplicate-doc-field and inject-field errors Barrett Ruth 2026-02-07 17:45:23 -05:00
74c2dd4c7a docs: document conflict resolution config and highlight groups Barrett Ruth 2026-02-07 17:39:35 -05:00
731222d027 feat(conflict): detect and resolve inline merge conflict markers Barrett Ruth 2026-02-07 17:38:34 -05:00
e06d22936c

Merge pull request #95 from barrettruth/fix/ux-tweaks Barrett Ruth 2026-02-07 16:59:48 -05:00
6b4953bf41 docs: document q keymap and window reuse behavior fix/ux-tweaks Barrett Ruth 2026-02-07 16:54:54 -05:00
c72efec77d fix(commands): add diff buffer UX improvements Barrett Ruth 2026-02-07 16:48:31 -05:00
52013d007d

Merge pull request #94 from barrettruth/feat/highlight-config-overrides Barrett Ruth 2026-02-07 15:54:05 -05:00
ae65c50f92 docs(readme): mention blend alpha and highlight overrides v0.1.5 Barrett Ruth 2026-02-07 15:53:08 -05:00
a0870a7892 feat(highlight): add highlights.overrides config table Barrett Ruth 2026-02-07 15:47:36 -05:00
a9eea9c157 feat(highlight): add highlights.overrides config table feat/highlight-config-overrides Barrett Ruth 2026-02-07 15:47:36 -05:00
b7477e3af2 feat(highlight): add configurable blend alpha Barrett Ruth 2026-02-07 15:46:47 -05:00
8e0c41bf6b fix(highlight): add default flag to DiffsDiff* groups Barrett Ruth 2026-02-07 15:45:34 -05:00
bcc70280fb docs: fix vim.max_lines default in config example Barrett Ruth 2026-02-07 15:44:56 -05:00
7049255931

Merge pull request #93 from barrettruth/fix/word-level-blend-alpha Barrett Ruth 2026-02-07 15:30:15 -05:00
5cfa91039b fix(highlight): use correct line number gutter colors fix/word-level-blend-alpha Barrett Ruth 2026-02-07 15:29:19 -05:00
d10eaed6ac fix(highlight): reduce word-level blend alpha and match line number bg Barrett Ruth 2026-02-07 15:23:14 -05:00
d353a6a314

Merge pull request #92 from barrettruth/fix/header-context-highlight Barrett Ruth 2026-02-07 15:14:25 -05:00
825012daeb fix(ci): remove unused variable fix/header-context-highlight Barrett Ruth 2026-02-07 15:12:44 -05:00
38220ab368 fix(highlight): use hunk body as context for header treesitter parsing Barrett Ruth 2026-02-07 15:10:07 -05:00
3b2e0de2a7

Merge pull request #91 from barrettruth/fix/hl-eol Barrett Ruth 2026-02-07 14:42:41 -05:00
011db2f8b3 fix(highlight): make hl_eol work on background extmarks fix/hl-eol Barrett Ruth 2026-02-07 14:40:55 -05:00
af37d25f25

Merge pull request #88 from barrettruth/fix/treesitter-injections Barrett Ruth 2026-02-07 14:33:12 -05:00
f6c0738384 docs: credit phanen for treesitter injection support fix/treesitter-injections Barrett Ruth 2026-02-07 14:32:04 -05:00
0cefa00d27 fix(highlight): include treesitter injections Barrett Ruth 2026-02-07 14:26:11 -05:00
2b1b1c3be2

Merge pull request #86 from barrettruth/feat/plug-mappings Barrett Ruth 2026-02-07 14:15:26 -05:00
97a6fb2bd7 feat: add <Plug> mappings feat/plug-mappings Barrett Ruth 2026-02-07 14:12:49 -05:00
4dc650957b

Merge pull request #85 from barrettruth/feat/context-padding Barrett Ruth 2026-02-07 13:18:15 -05:00
9e32384f18 refactor: change highlights.context config to table structure feat/context-padding Barrett Ruth 2026-02-07 13:16:34 -05:00
2e1ebdee03 feat(highlight): add treesitter context padding from disk Barrett Ruth 2026-02-07 13:05:53 -05:00