Skip to content

fix: Move existing file out of the way during rename #1794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FlippingBinary wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: Move existing file out of the way during rename #1794

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc464dc
fix: Move existing file out of the way during rename
FlippingBinary May 20, 2025
e624749
chore: Stylua corrections
FlippingBinary May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
chore: Stylua corrections
  • Loading branch information
@FlippingBinary
FlippingBinary committed May 22, 2025
commit e6247491cf3d477d537f467624e85f81b73c9750
10 changes: 4 additions & 6 deletions lua/blink/cmp/fuzzy/download/files.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,22 +170,20 @@ end
function files.rename(old_path, new_path)
return async.task.new(function(resolve, reject)
-- Generate a temporary filename with timestamp
local time = os.date("%Y%m%d%H%M%S")
local time = os.date('%Y%m%d%H%M%S')
local dirname = vim.fs.dirname(new_path)
local basename = vim.fs.basename(new_path)
local tmpfile = vim.fs.joinpath(dirname or ".", ".trash-" .. time .. "-" .. basename)
local tmpfile = vim.fs.joinpath(dirname or '.', '.trash-' .. time .. '-' .. basename)

-- Try to move new_path out of the way unconditionally
vim.uv.fs_rename(new_path, tmpfile, function(rename_existing_err)
if rename_existing_err then
-- Signal the fact that there is no tmp file to delete
tmpfile = ""
tmpfile = ''
end
-- Now move old_path to new_path
vim.uv.fs_rename(old_path, new_path, function(rename_err)
if rename_err then
return reject(rename_err)
end
if rename_err then return reject(rename_err) end
-- If we moved the original new_path, try to delete the temp file
if string.len(tmpfile) > 0 then
vim.uv.fs_unlink(tmpfile, function()
Expand Down