From 3038dac46009a778881a7ca98287a6c1cba1d160 Mon Sep 17 00:00:00 2001
From: Folke Lemaitre <folke.lemaitre@gmail.com>
Date: Tue, 4 Nov 2025 06:35:09 +0100
Subject: [PATCH] fix(picker.undo): cleanup tmp files in `async:on("done")`.
 Closes #2434

---
 lua/snacks/picker/source/vim.lua | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lua/snacks/picker/source/vim.lua b/lua/snacks/picker/source/vim.lua
index d86867f5..0576b923 100644
--- a/lua/snacks/picker/source/vim.lua
+++ b/lua/snacks/picker/source/vim.lua
@@ -382,6 +382,7 @@ function M.undo(opts, ctx)
   local buf = vim.api.nvim_get_current_buf()
   local file = vim.api.nvim_buf_get_name(buf)
   local items = {} ---@type snacks.picker.finder.Item[]
+  local diff_fn = vim.text and vim.text.diff or vim.diff
 
   -- Copy the current buffer to a temporary file and load the undo history.
   -- This is done to prevent the current buffer from being modified,
@@ -417,7 +418,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", opts.diff) --[[@as string]]
+    local diff = diff_fn(table.concat(before, "\n") .. "\n", table.concat(after, "\n") .. "\n", opts.diff) --[[@as string]]
     local changes = {} ---@type string[]
     local added_lines = {} ---@type string[]
     local removed_lines = {} ---@type string[]
@@ -479,6 +480,14 @@ function M.undo(opts, ctx)
   ---@param cb async fun(item: snacks.picker.finder.Item)
   ---@async
   return function(cb)
+    ctx.async:on("done", function()
+      vim.schedule(function()
+        -- Clean up the temporary files
+        vim.api.nvim_buf_delete(tmpbuf, { force = true })
+        vim.fn.delete(tmp_file)
+        vim.fn.delete(tmp_undo)
+      end)
+    end)
     for i = #items, 1, -1 do
       cb(items[i])
     end
@@ -495,9 +504,6 @@ function M.undo(opts, ctx)
       end)
       ctx.async:suspend()
     end
-    vim.schedule(function()
-      vim.api.nvim_buf_delete(tmpbuf, { force = true })
-    end)
   end
 end