GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-15 16:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(shada): shada should not store nobuflisted buffers #21818

Browse Source 
Problem:  Shada jumplist entries still include entries from e.g. 'nobuflisted' buffers.
Solution: Check `ignore_buf()` before adding jumplist entries, followup to b98eefd8.

Co-authored-by: Luuk van Baal <luukvbaal@gmail.com>
This commit is contained in:
Leonhard Kipp
2025-07-09 18:33:20 +02:00
committed by GitHub
parent 3a3484be29
commit 840cdb9589
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/shada.c
View File

@ -3630,12 +3630,8 @@ static inline size_t shada_init_jumps(PossiblyFreedShadaEntry *jumps,
curwin->w_jumplistlen);
continue;
}
const buf_T *const buf = (fm.fmark.fnum == 0
? NULL
: buflist_findnr(fm.fmark.fnum));
if (buf != NULL
? set_has(ptr_t, removable_bufs, (ptr_t)buf)
: fm.fmark.fnum != 0) {
const buf_T *const buf = (fm.fmark.fnum == 0 ? NULL : buflist_findnr(fm.fmark.fnum));
if (buf != NULL ? ignore_buf(buf, removable_bufs) : fm.fmark.fnum != 0) {
continue;
}
const char *const fname =

14
test/functional/shada/shada_spec.lua
View File

@ -213,6 +213,20 @@ describe('ShaDa support code', function()
eq({}, find_file(fname))
end)
it("does not store 'nobuflisted' buffer", function()
nvim_command('set shellslash')
local fname = fn.getcwd() .. '/file'
api.nvim_set_var('__fname', fname)
nvim_command('edit `=__fname`')
api.nvim_set_option_value('buflisted', false, {})
nvim_command('wshada! ' .. shada_fname)
eq({}, find_file(fname))
-- Set 'buflisted', then check again.
api.nvim_set_option_value('buflisted', true, {})
nvim_command('wshada! ' .. shada_fname)
eq({ [7] = 1, [8] = 1, [10] = 1 }, find_file(fname))
end)
it('is able to set &shada after &viminfo', function()
api.nvim_set_option_value('viminfo', "'10", {})
eq("'10", api.nvim_get_option_value('viminfo', {}))