mirror of
https://github.com/neovim/neovim.git
synced 2026-02-12 06:48:50 +00:00
Problem: With 'autochdir' win_execute() can corrupt the buffer name,
causing :write to use wrong path.
Solution: Save and restore b_fname when 'autochdir' is active
(Ingo Karkat).
This is caused by a bad interaction of the 'autochdir' behavior,
overriding of the current directory via :lchdir, and the temporary
window switching done by win_execute(), manifesting when e.g. a custom
completion inspects other buffers:
1. In the initial state after the :lcd .. we have curbuf->b_fname =
"Xsubdir/file".
2. do_autochdir() is invoked, temporarily undoing the :lcd .., changing
back into the Xsubdir/ subdirectory.
3. win_execute() switches windows, triggering win_enter_ext() →
win_fix_current_dir() → shorten_fnames(TRUE)
4. shorten_fnames() processes *all* buffers
5. shorten_buf_fname() makes the filename relative to the current
(wrong) directory; b_fname becomes "file" instead of "Xsubdir/file"
6. Directory restoration correctly restores working directory via
mch_chdir() (skipping a second do_autochdir() invocation because
apply_acd is FALSE), but b_fname remains corrupted, with the
"Xsubdir/" part missing.
7. expand("%:p") (and commands like :write) continue to use the
corrupted filename, resolving to a wrong path that's missing the
"Xsubdir/" part.
To fix the problem the short filename is saved if its in effect (i.e.
pointed to by curbuf->b_fname) and 'autochdir' happened. It's then
restored in case of a local cwd override. The conditions limit this
workaround to when 'autochdir' is active *and* overridden by a :lchdir.
closes: vim/vim#19343
abb4d74033
Co-authored-by: Ingo Karkat <swdev@ingo-karkat.de>
146 lines
4.7 KiB
Lua
146 lines
4.7 KiB
Lua
local t = require('test.testutil')
|
|
local n = require('test.functional.testnvim')()
|
|
|
|
local clear, eq, matches = n.clear, t.eq, t.matches
|
|
local eval, command, call, api = n.eval, n.command, n.call, n.api
|
|
local source, exec_capture = n.source, n.exec_capture
|
|
local mkdir = t.mkdir
|
|
|
|
local function expected_empty()
|
|
eq({}, api.nvim_get_vvar('errors'))
|
|
end
|
|
|
|
describe('autochdir behavior', function()
|
|
local dir = 'Xtest_functional_legacy_autochdir'
|
|
|
|
before_each(function()
|
|
mkdir(dir)
|
|
clear()
|
|
command('set shellslash')
|
|
end)
|
|
|
|
after_each(function()
|
|
n.rmdir(dir)
|
|
end)
|
|
|
|
-- Tests vim/vim#777 without test_autochdir().
|
|
it('sets filename', function()
|
|
command('set acd')
|
|
command('new')
|
|
command('w ' .. dir .. '/Xtest')
|
|
eq('Xtest', eval("expand('%')"))
|
|
eq(dir, eval([[substitute(getcwd(), '.*/\(\k*\)', '\1', '')]]))
|
|
end)
|
|
|
|
-- oldtest: Test_set_filename_other_window()
|
|
it(':file in win_execute() does not cause wrong directory', function()
|
|
command('cd ' .. dir)
|
|
source([[
|
|
func Test_set_filename_other_window()
|
|
let cwd = getcwd()
|
|
call mkdir('Xa')
|
|
call mkdir('Xb')
|
|
call mkdir('Xc')
|
|
try
|
|
args Xa/aaa.txt Xb/bbb.txt
|
|
set acd
|
|
let winid = win_getid()
|
|
snext
|
|
call assert_equal('Xb', substitute(getcwd(), '.*/\([^/]*\)$', '\1', ''))
|
|
call win_execute(winid, 'file ' .. cwd .. '/Xc/ccc.txt')
|
|
call assert_equal('Xb', substitute(getcwd(), '.*/\([^/]*\)$', '\1', ''))
|
|
finally
|
|
set noacd
|
|
call chdir(cwd)
|
|
call delete('Xa', 'rf')
|
|
call delete('Xb', 'rf')
|
|
call delete('Xc', 'rf')
|
|
bwipe! aaa.txt
|
|
bwipe! bbb.txt
|
|
bwipe! ccc.txt
|
|
endtry
|
|
endfunc
|
|
]])
|
|
call('Test_set_filename_other_window')
|
|
expected_empty()
|
|
end)
|
|
|
|
-- oldtest: Test_acd_win_execute()
|
|
it('win_execute() does not change directory', function()
|
|
local subdir = 'Xfile'
|
|
command('cd ' .. dir)
|
|
command('set acd')
|
|
call('mkdir', subdir)
|
|
local winid = eval('win_getid()')
|
|
command('new ' .. subdir .. '/file')
|
|
matches(dir .. '/' .. subdir .. '$', eval('getcwd()'))
|
|
command('cd ..')
|
|
matches(dir .. '$', eval('getcwd()'))
|
|
call('win_execute', winid, 'echo')
|
|
matches(dir .. '$', eval('getcwd()'))
|
|
end)
|
|
|
|
-- oldtest: Test_verbose_pwd()
|
|
it(':verbose pwd shows whether autochdir is used', function()
|
|
local subdir = 'Xautodir'
|
|
command('cd ' .. dir)
|
|
local cwd = eval('getcwd()')
|
|
command('edit global.txt')
|
|
matches('%[global%].*' .. dir .. '$', exec_capture('verbose pwd'))
|
|
call('mkdir', subdir)
|
|
command('split ' .. subdir .. '/local.txt')
|
|
command('lcd ' .. subdir)
|
|
matches('%[window%].*' .. dir .. '/' .. subdir .. '$', exec_capture('verbose pwd'))
|
|
command('set acd')
|
|
command('wincmd w')
|
|
matches('%[autochdir%].*' .. dir .. '$', exec_capture('verbose pwd'))
|
|
command('tcd ' .. cwd)
|
|
matches('%[tabpage%].*' .. dir .. '$', exec_capture('verbose pwd'))
|
|
command('cd ' .. cwd)
|
|
matches('%[global%].*' .. dir .. '$', exec_capture('verbose pwd'))
|
|
command('lcd ' .. cwd)
|
|
matches('%[window%].*' .. dir .. '$', exec_capture('verbose pwd'))
|
|
command('edit')
|
|
matches('%[autochdir%].*' .. dir .. '$', exec_capture('verbose pwd'))
|
|
command('enew')
|
|
command('wincmd w')
|
|
matches('%[autochdir%].*' .. dir .. '/' .. subdir .. '$', exec_capture('verbose pwd'))
|
|
command('wincmd w')
|
|
matches('%[window%].*' .. dir .. '$', exec_capture('verbose pwd'))
|
|
command('wincmd w')
|
|
matches('%[autochdir%].*' .. dir .. '/' .. subdir .. '$', exec_capture('verbose pwd'))
|
|
command('set noacd')
|
|
matches('%[autochdir%].*' .. dir .. '/' .. subdir .. '$', exec_capture('verbose pwd'))
|
|
command('wincmd w')
|
|
matches('%[window%].*' .. dir .. '$', exec_capture('verbose pwd'))
|
|
command('cd ' .. cwd)
|
|
matches('%[global%].*' .. dir .. '$', exec_capture('verbose pwd'))
|
|
command('wincmd w')
|
|
matches('%[window%].*' .. dir .. '/' .. subdir .. '$', exec_capture('verbose pwd'))
|
|
end)
|
|
|
|
it('overriding via :lcd is not clobbered by win_execute()', function()
|
|
command('cd ' .. dir)
|
|
source([[
|
|
func Test_lcd_win_execute()
|
|
let startdir = getcwd()
|
|
call mkdir('Xsubdir', 'R')
|
|
set autochdir
|
|
edit Xsubdir/file
|
|
call assert_match('_autochdir.Xsubdir.file$', expand('%:p'))
|
|
split
|
|
lcd ..
|
|
call assert_match('_autochdir.Xsubdir.file$', expand('%:p'))
|
|
call win_execute(win_getid(2), "")
|
|
call assert_match('_autochdir.Xsubdir.file$', expand('%:p'))
|
|
|
|
set noautochdir
|
|
bwipe!
|
|
call chdir(startdir)
|
|
endfunc
|
|
]])
|
|
call('Test_lcd_win_execute')
|
|
expected_empty()
|
|
end)
|
|
end)
|