diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-10-28 10:42:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-28 10:42:18 +0800 |
| commit | ac353e87aecf02315d82a3ad22725d2bc8140f0c (patch) | |
| tree | c5160c0dfe383fd218c716a16ba2ce7b195e35ae /src | |
| parent | f97248db757ee300b7808c3dd67858d489b604fd (diff) | |
| download | rneovim-ac353e87aecf02315d82a3ad22725d2bc8140f0c.tar.gz rneovim-ac353e87aecf02315d82a3ad22725d2bc8140f0c.tar.bz2 rneovim-ac353e87aecf02315d82a3ad22725d2bc8140f0c.zip | |
vim-patch:9.0.2075: TextChangedI may not always trigger (#25808)
Problem: TextChangedI may not always trigger
Solution: trigger it in more cases: for insert/
append/change operations, and when
opening a new line,
fixes: vim/vim#13367
closes: vim/vim#13375
https://github.com/vim/vim/commit/4bca4897a12dfb91b3b27e3083fd5f370bd857d1
Co-authored-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/edit.c | 3 | ||||
| -rw-r--r-- | src/nvim/normal.c | 7 | ||||
| -rw-r--r-- | src/nvim/ops.c | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index a7a98b9557..ef0317b212 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -143,9 +143,6 @@ static void insert_enter(InsertState *s) update_Insstart_orig = true; ins_compl_clear(); // clear stuff for CTRL-X mode - // Reset Changedtick_i, so that TextChangedI will only be triggered for stuff - // from insert mode - curbuf->b_last_changedtick_i = buf_get_changedtick(curbuf); // Trigger InsertEnter autocommands. Do not do this for "r<CR>" or "grx". if (s->cmdchar != 'r' && s->cmdchar != 'v') { diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 1f2403450f..93bbdd3be9 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -5724,6 +5724,8 @@ static void n_opencmd(cmdarg_T *cap) (void)hasFolding(curwin->w_cursor.lnum, NULL, &curwin->w_cursor.lnum); } + // trigger TextChangedI for the 'o/O' command + curbuf->b_last_changedtick_i = buf_get_changedtick(curbuf); if (u_save(curwin->w_cursor.lnum - (cap->cmdchar == 'O' ? 1 : 0), curwin->w_cursor.lnum + (cap->cmdchar == 'o' ? 1 : 0)) && open_line(cap->cmdchar == 'O' ? BACKWARD : FORWARD, @@ -6265,6 +6267,11 @@ static void invoke_edit(cmdarg_T *cap, int repl, int cmd, int startln) // Always reset "restart_edit", this is not a restarted edit. restart_edit = 0; + // Reset Changedtick_i, so that TextChangedI will only be triggered for stuff + // from insert mode, for 'o/O' this has already been done in n_opencmd + if (cap->cmdchar != 'O' && cap->cmdchar != 'o') { + curbuf->b_last_changedtick_i = buf_get_changedtick(curbuf); + } if (edit(cmd, startln, cap->count1)) { cap->retval |= CA_COMMAND_BUSY; } diff --git a/src/nvim/ops.c b/src/nvim/ops.c index 260019da33..f325eceaaf 100644 --- a/src/nvim/ops.c +++ b/src/nvim/ops.c @@ -6226,6 +6226,9 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank) // Restore linebreak, so that when the user edits it looks as before. restore_lbr(lbr_saved); + // trigger TextChangedI + curbuf->b_last_changedtick_i = buf_get_changedtick(curbuf); + if (op_change(oap)) { // will call edit() cap->retval |= CA_COMMAND_BUSY; } @@ -6324,6 +6327,9 @@ void do_pending_operator(cmdarg_T *cap, int old_col, bool gui_yank) // Restore linebreak, so that when the user edits it looks as before. restore_lbr(lbr_saved); + // trigger TextChangedI + curbuf->b_last_changedtick_i = buf_get_changedtick(curbuf); + op_insert(oap, cap->count1); // Reset linebreak, so that formatting works correctly. |