Mercurial > vim
changeset 33572:830a5f8053cb v9.0.2031
patch 9.0.2031: TextChangedI may be triggered by non-insert mode change
Commit: https://github.com/vim/vim/commit/d7ae263af8f6a2da55ce3702d18c53ab1418bca7
Author: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
Date: Sun Oct 15 09:59:00 2023 +0200
patch 9.0.2031: TextChangedI may be triggered by non-insert mode change
Problem: `TextChangedI` can trigger on entering Insert mode if there
was previously a change not in Insert mode.
Solution: Make it trigger only when text is actually changed in Insert
mode.
closes: #13265
closes: #13338
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Evgeni Chasnovski <evgeni.chasnovski@gmail.com>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 15 Oct 2023 10:15:03 +0200 |
| parents | 93082dd250b6 |
| children | dabf31f29b4f |
| files | src/edit.c src/testdir/test_autocmd.vim src/version.c |
| diffstat | 3 files changed, 23 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/edit.c +++ b/src/edit.c @@ -174,6 +174,9 @@ edit( return FALSE; } 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 = CHANGEDTICK(curbuf); /* * Trigger InsertEnter autocommands. Do not do this for "r<CR>" or "grx". @@ -840,6 +843,7 @@ doESCkey: if (cmdchar != 'r' && cmdchar != 'v' && c != Ctrl_C) ins_apply_autocmds(EVENT_INSERTLEAVE); did_cursorhold = FALSE; + curbuf->b_last_changedtick = CHANGEDTICK(curbuf); return (c == Ctrl_O); } continue;
--- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -2566,27 +2566,28 @@ func Test_ChangedP() call cursor(3, 1) let g:autocmd = '' call feedkeys("o\<esc>", 'tnix') - call assert_equal('I', g:autocmd) + " `TextChangedI` triggers only if text is actually changed in Insert mode + call assert_equal('', g:autocmd) let g:autocmd = '' call feedkeys("Sf", 'tnix') - call assert_equal('II', g:autocmd) + call assert_equal('I', g:autocmd) let g:autocmd = '' call feedkeys("Sf\<C-N>", 'tnix') - call assert_equal('IIP', g:autocmd) + call assert_equal('IP', g:autocmd) let g:autocmd = '' call feedkeys("Sf\<C-N>\<C-N>", 'tnix') - call assert_equal('IIPP', g:autocmd) + call assert_equal('IPP', g:autocmd) let g:autocmd = '' call feedkeys("Sf\<C-N>\<C-N>\<C-N>", 'tnix') - call assert_equal('IIPPP', g:autocmd) + call assert_equal('IPPP', g:autocmd) let g:autocmd = '' call feedkeys("Sf\<C-N>\<C-N>\<C-N>\<C-N>", 'tnix') - call assert_equal('IIPPPP', g:autocmd) + call assert_equal('IPPPP', g:autocmd) call assert_equal(['foo', 'bar', 'foobar', 'foo'], getline(1, '$')) " TODO: how should it handle completeopt=noinsert,noselect? @@ -3610,6 +3611,16 @@ func Test_Changed_ChangedI() " call assert_equal('N4', g:autocmd_n) call assert_equal('I3', g:autocmd_i) + " TextChangedI should only trigger if change was done in Insert mode + let g:autocmd_i = '' + call feedkeys("yypi\<esc>", 'tnix') + call assert_equal('', g:autocmd_i) + + " TextChanged should only trigger if change was done in Normal mode + let g:autocmd_n = '' + call feedkeys("ibar\<esc>", 'tnix') + call assert_equal('', g:autocmd_n) + " CleanUp call test_override("char_avail", 0) au! TextChanged <buffer>