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(shada): update marks when using delmarks! (#24978)

Browse Source
This commit is contained in:
Maria José Solano 2023-09-02 19:34:09 -07:00 committed by GitHub
parent 36cb3262b9
commit 517dfdf0fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/nvim/mark.c
View File

@ -925,7 +925,24 @@ void ex_delmarks(exarg_T *eap)
if (*eap->arg == NUL && eap->forceit) {
// clear all marks
clrallmarks(curbuf);
const Timestamp timestamp = os_time();
for (size_t i = 0; i < NMARKS; i++) {
curbuf->b_namedm[i].mark.lnum = 0;
curbuf->b_namedm[i].timestamp = timestamp;
}
curbuf->b_last_cursor.timestamp = timestamp;
CLEAR_FMARK(&curbuf->b_last_cursor);
curbuf->b_last_cursor.mark.lnum = 1;
curbuf->b_last_insert.timestamp = timestamp;
CLEAR_FMARK(&curbuf->b_last_insert);
curbuf->b_last_change.timestamp = timestamp;
CLEAR_FMARK(&curbuf->b_last_change);
curbuf->b_op_start.lnum = 0; // start/end op mark cleared
curbuf->b_op_end.lnum = 0;
for (int i = 0; i < curbuf->b_changelistlen; i++) {
clear_fmark(&curbuf->b_changelist[i]);
}
curbuf->b_changelistlen = 0;
} else if (eap->forceit) {
emsg(_(e_invarg));
} else if (*eap->arg == NUL) {

22
test/functional/shada/marks_spec.lua
View File

@ -272,4 +272,26 @@ describe('ShaDa support code', function()
eq('Vim(normal):E20: Mark not set', exc_exec('normal! `a'))
eq('Vim(normal):E20: Mark not set', exc_exec('normal! `.'))
end)
it('updates deleted marks with :delmarks!', function()
nvim_command('edit ' .. testfilename)
nvim_command('mark A')
nvim_command('mark a')
feed('ggifoobar<esc>')
nvim_command('wshada')
reset()
nvim_command('edit ' .. testfilename)
nvim_command('normal! `A`a`.')
nvim_command('delmarks!')
nvim_command('wshada')
reset()
nvim_command('edit ' .. testfilename)
eq('Vim(normal):E20: Mark not set', exc_exec('normal! `a'))
eq('Vim(normal):E20: Mark not set', exc_exec('normal! `.'))
-- Make sure that uppercase marks aren't deleted.
nvim_command('normal! `A')
end)
end)