diff options
| author | Luuk van Baal <luukvbaal@gmail.com> | 2024-01-17 13:31:07 +0100 |
|---|---|---|
| committer | Luuk van Baal <luukvbaal@gmail.com> | 2024-01-17 23:17:04 +0100 |
| commit | 437d35dbf7d9ff6f6e561377f5d23d7e4ac4d565 (patch) | |
| tree | 894e12d7a02b8889cc0fc3d6b249415572bb738c | |
| parent | 4615d46f93fb0b15a427f428bb1e652b4ccb873b (diff) | |
| download | rneovim-437d35dbf7d9ff6f6e561377f5d23d7e4ac4d565.tar.gz rneovim-437d35dbf7d9ff6f6e561377f5d23d7e4ac4d565.tar.bz2 rneovim-437d35dbf7d9ff6f6e561377f5d23d7e4ac4d565.zip | |
fix(extmarks): do not remove invalid marks from decor upon deletion
| -rw-r--r-- | src/nvim/extmark.c | 13 | ||||
| -rw-r--r-- | test/functional/api/extmark_spec.lua | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/nvim/extmark.c b/src/nvim/extmark.c index 0321a11b0f..73a54729f8 100644 --- a/src/nvim/extmark.c +++ b/src/nvim/extmark.c @@ -150,7 +150,11 @@ void extmark_del(buf_T *buf, MarkTreeIter *itr, MTKey key, bool restore) } if (mt_decor_any(key)) { - buf_decor_remove(buf, key.pos.row, key2.pos.row, mt_decor(key), true); + if (mt_invalid(key)) { + decor_free(mt_decor(key)); + } else { + buf_decor_remove(buf, key.pos.row, key2.pos.row, mt_decor(key), true); + } } // TODO(bfredl): delete it from current undo header, opportunistically? @@ -393,10 +397,9 @@ void extmark_apply_undo(ExtmarkUndoObject undo_info, bool undo) } else if (undo_info.type == kExtmarkSavePos) { ExtmarkSavePos pos = undo_info.data.savepos; if (undo) { - if (pos.old_row >= 0) { - extmark_setraw(curbuf, pos.mark, pos.old_row, pos.old_col); - } - if (pos.invalidated) { + if (pos.old_row >= 0 + && extmark_setraw(curbuf, pos.mark, pos.old_row, pos.old_col) + && pos.invalidated) { MarkTreeIter itr[1] = { 0 }; MTKey mark = marktree_lookup(curbuf->b_marktree, pos.mark, itr); mt_itr_rawkey(itr).flags &= (uint16_t) ~MT_FLAG_INVALID; diff --git a/test/functional/api/extmark_spec.lua b/test/functional/api/extmark_spec.lua index 54f4aaab03..19ad26fa86 100644 --- a/test/functional/api/extmark_spec.lua +++ b/test/functional/api/extmark_spec.lua @@ -1712,6 +1712,10 @@ describe('API/extmarks', function() aaa bbb ccc |*2 | ]]) + -- decor is not removed twice + command('d3') + api.nvim_buf_del_extmark(0, ns, 1) + command('silent undo') -- mark is deleted with undo_restore == false set_extmark(ns, 1, 0, 0, { invalidate = true, undo_restore = false, sign_text = 'S1' }) set_extmark(ns, 2, 1, 0, { invalidate = true, undo_restore = false, sign_text = 'S2' }) |