feat(picker.undo): make diff opts for undo configurable

folke · Feb 2, 2025 · d61fb45 · d61fb45
1 parent 8368176
commit d61fb45
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lua/snacks/picker/config/sources.lua b/lua/snacks/picker/config/sources.lua
@@ -692,13 +692,21 @@ M.spelling = {
   confirm = "item_action",
 }
 
+---@class snacks.picker.undo.Config: snacks.picker.Config
+---@field diff? vim.diff.Opts
 M.undo = {
   finder = "vim_undo",
   format = "undo",
   preview = "preview",
   confirm = "item_action",
   win = { preview = { wo = { number = false, relativenumber = false, signcolumn = "no" } } },
   icons = { tree = { last = "┌╴" } }, -- the tree is upside down
+  diff = {
+    ctxlen = 4,
+    ignore_cr_at_eol = true,
+    ignore_whitespace_change_at_eol = true,
+    indent_heuristic = true,
+  },
 }
 
 -- Open a project from zoxide

diff --git a/lua/snacks/picker/source/vim.lua b/lua/snacks/picker/source/vim.lua
@@ -333,6 +333,7 @@ function M.spelling()
   return items
 end
 
+---@param opts snacks.picker.undo.Config
 ---@type snacks.picker.finder
 function M.undo(opts, ctx)
   local tree = vim.fn.undotree()
@@ -374,7 +375,7 @@ function M.undo(opts, ctx)
     end)
     vim.o.eventignore = ei
 
-    local diff = vim.diff(table.concat(before, "\n") .. "\n", table.concat(after, "\n") .. "\n", { ctxlen = 4 }) --[[@as string]]
+    local diff = vim.diff(table.concat(before, "\n"), table.concat(after, "\n"), opts.diff) --[[@as string]]
     local changes = {} ---@type string[]
     local added, removed = 0, 0