mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
fix!: make :undo! notify buffer update callbacks (#20344)
When :undo! was introduced to Nvim the implementation of 'inccommand' preview callback hasn't been fully decided yet, so not notifying buffer update callbacks made sense for 'inccommand' preview callback in case it needs to undo the changes itself. Now it turns out that the undo-and-forget is done automatically for 'inccommand', so it doesn't make sense for :undo! to avoid notifying buffer update callbacks anymore.
This commit is contained in:
parent
a6c9764eda
commit
ac66f5af06
@ -5867,7 +5867,7 @@ static void ex_undo(exarg_T *eap)
|
||||
{
|
||||
if (eap->addr_count != 1) {
|
||||
if (eap->forceit) {
|
||||
u_undo_and_forget(1); // :undo!
|
||||
u_undo_and_forget(1, true); // :undo!
|
||||
} else {
|
||||
u_undo(1); // :undo
|
||||
}
|
||||
@ -5894,7 +5894,7 @@ static void ex_undo(exarg_T *eap)
|
||||
emsg(_(e_undobang_cannot_redo_or_move_branch));
|
||||
return;
|
||||
}
|
||||
u_undo_and_forget(count);
|
||||
u_undo_and_forget(count, true);
|
||||
} else { // :undo 123
|
||||
undo_time(step, false, false, true);
|
||||
}
|
||||
|
@ -2194,7 +2194,7 @@ static void cmdpreview_restore_state(CpInfo *cpinfo)
|
||||
aco_save_T aco;
|
||||
aucmd_prepbuf(&aco, buf);
|
||||
// Undo invisibly. This also moves the cursor!
|
||||
if (!u_undo_and_forget(count)) {
|
||||
if (!u_undo_and_forget(count, false)) {
|
||||
abort();
|
||||
}
|
||||
aucmd_restbuf(&aco);
|
||||
|
@ -1771,16 +1771,16 @@ void u_redo(int count)
|
||||
|
||||
/// Undo and remove the branch from the undo tree.
|
||||
/// Also moves the cursor (as a "normal" undo would).
|
||||
bool u_undo_and_forget(int count)
|
||||
///
|
||||
/// @param do_buf_event If `true`, send the changedtick with the buffer updates
|
||||
bool u_undo_and_forget(int count, bool do_buf_event)
|
||||
{
|
||||
if (curbuf->b_u_synced == false) {
|
||||
u_sync(true);
|
||||
count = 1;
|
||||
}
|
||||
undo_undoes = true;
|
||||
u_doit(count, true,
|
||||
// Don't send nvim_buf_lines_event for u_undo_and_forget().
|
||||
false);
|
||||
u_doit(count, true, do_buf_event);
|
||||
|
||||
if (curbuf->b_u_curhead == NULL) {
|
||||
// nothing was undone.
|
||||
|
@ -118,6 +118,24 @@ describe('lua buffer event callbacks: on_lines', function()
|
||||
}
|
||||
tick = tick + 1
|
||||
|
||||
tick = tick + 1
|
||||
command('redo')
|
||||
check_events {
|
||||
{ "test1", "lines", 1, tick, 3, 5, 4, 32 };
|
||||
{ "test2", "lines", 1, tick, 3, 5, 4, 32 };
|
||||
{ "test2", "changedtick", 1, tick+1 };
|
||||
}
|
||||
tick = tick + 1
|
||||
|
||||
tick = tick + 1
|
||||
command('undo!')
|
||||
check_events {
|
||||
{ "test1", "lines", 1, tick, 3, 4, 5, 13 };
|
||||
{ "test2", "lines", 1, tick, 3, 4, 5, 13 };
|
||||
{ "test2", "changedtick", 1, tick+1 };
|
||||
}
|
||||
tick = tick + 1
|
||||
|
||||
-- simulate next callback returning true
|
||||
exec_lua("test_unreg = 'test1'")
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user