wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): rename undofile when renaming (#27684)

Browse Source 
Problem:
After `rename()`, the undo information for the renamed file(s) are lost.

Solution:
Rename the undofile as well.
This commit is contained in:
Jaehwang Jung 2024-03-02 02:31:54 +09:00 committed by GitHub
parent 5d4e1693cb
commit b413f5d048
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/lua/vim/lsp/util.lua
View File

@ -724,6 +724,13 @@ function M.rename(old_fname, new_fname, opts)
local ok, err = os.rename(old_fname_full, new_fname)
assert(ok, err)
local old_undofile = vim.fn.undofile(old_fname_full)
if uv.fs_stat(old_undofile) ~= nil then
local new_undofile = vim.fn.undofile(new_fname)
vim.fn.mkdir(assert(vim.fs.dirname(new_undofile)), 'p')
os.rename(old_undofile, new_undofile)
end
if vim.fn.isdirectory(new_fname) == 0 then
local newbuf = vim.fn.bufadd(new_fname)
if win then

52
test/functional/plugin/lsp_spec.lua
View File

@ -2593,6 +2593,58 @@ describe('LSP', function()
eq('New file', read_file(new))
end
)
it('Maintains undo information for loaded buffer', function()
local old = tmpname()
write_file(old, 'line')
local new = tmpname()
os.remove(new)
local undo_kept = exec_lua(
[[
local old = select(1, ...)
local new = select(2, ...)
vim.opt.undofile = true
vim.cmd.edit(old)
vim.cmd.normal('dd')
vim.cmd.write()
local undotree = vim.fn.undotree()
vim.lsp.util.rename(old, new)
return vim.deep_equal(undotree, vim.fn.undotree())
]],
old,
new
)
eq(false, exec_lua('return vim.uv.fs_stat(...) ~= nil', old))
eq(true, exec_lua('return vim.uv.fs_stat(...) ~= nil', new))
eq(true, undo_kept)
end)
it('Maintains undo information for unloaded buffer', function()
local old = tmpname()
write_file(old, 'line')
local new = tmpname()
os.remove(new)
local undo_kept = exec_lua(
[[
local old = select(1, ...)
local new = select(2, ...)
vim.opt.undofile = true
vim.cmd.split(old)
vim.cmd.normal('dd')
vim.cmd.write()
local undotree = vim.fn.undotree()
vim.cmd.bdelete()
vim.lsp.util.rename(old, new)
vim.cmd.edit(new)
return vim.deep_equal(undotree, vim.fn.undotree())
]],
old,
new
)
eq(false, exec_lua('return vim.uv.fs_stat(...) ~= nil', old))
eq(true, exec_lua('return vim.uv.fs_stat(...) ~= nil', new))
eq(true, undo_kept)
end)
it('Does override target if overwrite is true', function()
local old = tmpname()
write_file(old, 'Old file')