kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-29 14:41:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15062 from seandewar/vim-8.1.0829

Browse Source 
vim-patch:8.1.0829: when 'hidden' is set session creates extra buffers
This commit is contained in:
Jan Edmund Lazo 2021-07-30 09:19:44 -04:00 committed by GitHub
commit ca3071ea93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/nvim/ex_session.c
View File

@ -583,22 +583,6 @@ static int makeopens(FILE *fd, char_u *dirnow)
return FAIL;
}
// Now put the other buffers into the buffer list.
FOR_ALL_BUFFERS(buf) {
if (!(only_save_windows && buf->b_nwindows == 0)
&& !(buf->b_help && !(ssop_flags & SSOP_HELP))
&& buf->b_fname != NULL
&& buf->b_p_bl) {
if (fprintf(fd, "badd +%" PRId64 " ",
buf->b_wininfo == NULL
? (int64_t)1L
: (int64_t)buf->b_wininfo->wi_fpos.lnum) < 0
|| ses_fname(fd, buf, &ssop_flags, true) == FAIL) {
return FAIL;
}
}
}
// the global argument list
if (ses_arglist(fd, "argglobal", &global_alist.al_ga,
!(ssop_flags & SSOP_CURDIR), &ssop_flags) == FAIL) {
@ -813,12 +797,31 @@ static int makeopens(FILE *fd, char_u *dirnow)
return FAIL;
}
// Now put the remaining buffers into the buffer list.
// This is near the end, so that when 'hidden' is set we don't create extra
// buffers. If the buffer was already created with another command the
// ":badd" will have no effect.
FOR_ALL_BUFFERS(buf) {
if (!(only_save_windows && buf->b_nwindows == 0)
&& !(buf->b_help && !(ssop_flags & SSOP_HELP))
&& buf->b_fname != NULL
&& buf->b_p_bl) {
if (fprintf(fd, "badd +%" PRId64 " ",
buf->b_wininfo == NULL
? (int64_t)1L
: (int64_t)buf->b_wininfo->wi_fpos.lnum) < 0
|| ses_fname(fd, buf, &ssop_flags, true) == FAIL) {
return FAIL;
}
}
}
//
// Wipe out an empty unnamed buffer we started in.
//
if (fprintf(fd, "%s",
"if exists('s:wipebuf') "
"&& len(win_findbuf(s:wipebuf)) == 0"
"&& len(win_findbuf(s:wipebuf)) == 0 "
"&& getbufvar(s:wipebuf, '&buftype') isnot# 'terminal'\n"
" silent exe 'bwipe ' . s:wipebuf\n"
"endif\n"

23
src/nvim/testdir/test_mksession.vim
View File

@ -287,6 +287,29 @@ func Test_mksession_blank_windows()
call delete('Xtest_mks.out')
endfunc
func Test_mksession_buffer_count()
set hidden
" Edit exactly three files in the current session.
%bwipe!
e Xfoo | tabe Xbar | tabe Xbaz
tabdo write
mksession! Xtest_mks.out
" Verify that loading the session does not create additional buffers.
%bwipe!
source Xtest_mks.out
call assert_equal(3, len(getbufinfo()))
" Clean up.
call delete('Xfoo')
call delete('Xbar')
call delete('Xbaz')
call delete('Xtest_mks.out')
%bwipe!
set hidden&
endfunc
if has('extra_search')
func Test_mksession_hlsearch()

9
test/functional/ex_cmds/mksession_spec.lua
View File

@ -43,7 +43,7 @@ describe(':mksession', function()
-- Restore session.
command('source '..session_file)
eq({3,3,2},
eq({2,2,4},
{funcs.winbufnr(1), funcs.winbufnr(2), funcs.winbufnr(3)})
end)
@ -91,7 +91,12 @@ describe(':mksession', function()
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'))
-- :mksession stores paths using unix slashes, but Nvim doesn't adjust these
-- for absolute paths in all cases yet. Absolute paths are used in the
-- session file after :tcd, so we need to expect unix slashes here for now
-- eq(cwd_dir .. get_pathsep() .. tmpfile_base .. '2', funcs.expand('%:p'))
eq(cwd_dir:gsub([[\]], '/') .. '/' .. tmpfile_base .. '2',
funcs.expand('%:p'))
end)
it('restores CWD for :terminal buffers #11288', function()