mirror of
https://github.com/neovim/neovim.git
synced 2024-12-25 21:55:17 -07:00
cf67f19ac2
Problem: When session-restore creates a terminal buffer with command
like `:edit term://.//16450:/bin/bash`, the buffer gets
a different name (depends on PID). Thus the later call to
`bufexists('term://.//16450:/bin/bash)` will return false.
Solution: Force the buffer name with :file. This as least ensures
the same buffer will show in multiple windows correctly, as
expected when saving the session. But it still has problems:
1. the PID in the buffer name is bogus
2. redundant :terminal buffers still hang around
fix #5250
114 lines
3.3 KiB
Lua
114 lines
3.3 KiB
Lua
local lfs = require('lfs')
|
|
local helpers = require('test.functional.helpers')(after_each)
|
|
|
|
local clear = helpers.clear
|
|
local command = helpers.command
|
|
local get_pathsep = helpers.get_pathsep
|
|
local eq = helpers.eq
|
|
local funcs = helpers.funcs
|
|
local matches = helpers.matches
|
|
local pesc = helpers.pesc
|
|
local rmdir = helpers.rmdir
|
|
|
|
local file_prefix = 'Xtest-functional-ex_cmds-mksession_spec'
|
|
|
|
describe(':mksession', function()
|
|
local session_file = file_prefix .. '.vim'
|
|
local tab_dir = file_prefix .. '.d'
|
|
|
|
before_each(function()
|
|
clear()
|
|
lfs.mkdir(tab_dir)
|
|
end)
|
|
|
|
after_each(function()
|
|
os.remove(session_file)
|
|
rmdir(tab_dir)
|
|
end)
|
|
|
|
it('restores tab-local working directories', function()
|
|
local tmpfile_base = file_prefix .. '-tmpfile'
|
|
local cwd_dir = funcs.getcwd()
|
|
|
|
-- :mksession does not save empty tabs, so create some buffers.
|
|
command('edit ' .. tmpfile_base .. '1')
|
|
command('tabnew')
|
|
command('edit ' .. tmpfile_base .. '2')
|
|
command('tcd ' .. tab_dir)
|
|
command('tabfirst')
|
|
command('mksession ' .. session_file)
|
|
|
|
-- Create a new test instance of Nvim.
|
|
clear()
|
|
|
|
command('source ' .. session_file)
|
|
-- First tab should have the original working directory.
|
|
command('tabnext 1')
|
|
eq(cwd_dir, funcs.getcwd())
|
|
-- Second tab should have the tab-local working directory.
|
|
command('tabnext 2')
|
|
eq(cwd_dir .. get_pathsep() .. tab_dir, funcs.getcwd())
|
|
end)
|
|
|
|
it('restores buffers with tab-local CWD', function()
|
|
local tmpfile_base = file_prefix .. '-tmpfile'
|
|
local cwd_dir = funcs.getcwd()
|
|
local session_path = cwd_dir .. get_pathsep() .. session_file
|
|
|
|
command('edit ' .. tmpfile_base .. '1')
|
|
command('tcd ' .. tab_dir)
|
|
command('tabnew')
|
|
command('edit ' .. cwd_dir .. get_pathsep() .. tmpfile_base .. '2')
|
|
command('tabfirst')
|
|
command('mksession ' .. session_path)
|
|
|
|
-- Create a new test instance of Nvim.
|
|
clear()
|
|
|
|
-- Use :silent to avoid press-enter prompt due to long path
|
|
command('silent source ' .. session_path)
|
|
command('tabnext 1')
|
|
eq(cwd_dir .. get_pathsep() .. tmpfile_base .. '1', funcs.expand('%:p'))
|
|
command('tabnext 2')
|
|
eq(cwd_dir .. get_pathsep() .. tmpfile_base .. '2', funcs.expand('%:p'))
|
|
end)
|
|
|
|
it('restores CWD for :terminal buffers #11288', function()
|
|
local cwd_dir = funcs.fnamemodify('.', ':p:~'):gsub([[[\/]*$]], '')
|
|
local session_path = cwd_dir..get_pathsep()..session_file
|
|
|
|
command('cd '..tab_dir)
|
|
command('terminal echo $PWD')
|
|
command('cd '..cwd_dir)
|
|
command('mksession '..session_path)
|
|
command('qall!')
|
|
|
|
-- Create a new test instance of Nvim.
|
|
clear()
|
|
command('silent source '..session_path)
|
|
|
|
local expected_cwd = cwd_dir..get_pathsep()..tab_dir
|
|
matches('^term://'..pesc(expected_cwd)..'//%d+:', funcs.expand('%'))
|
|
command('qall!')
|
|
end)
|
|
|
|
it('restores multiple windows with same terminal instances', function()
|
|
-- Create a view with two buffers referencing the same terminal instance
|
|
command('terminal')
|
|
command('split')
|
|
command('mksession ' .. session_file)
|
|
|
|
clear()
|
|
|
|
command('source ' .. session_file)
|
|
-- Getting the name of the buffer shown to compare with the other window
|
|
local eval = helpers.eval
|
|
|
|
command('exe 1 . "wincmd w"')
|
|
local expected_pid = eval('b:terminal_job_pid')
|
|
|
|
command('exe 2 . "wincmd w"')
|
|
eq(expected_pid, eval('b:terminal_job_pid'))
|
|
end)
|
|
end)
|