From db3b44640d69ab27270691a3cab8d83cc93a0861 Mon Sep 17 00:00:00 2001 From: Christian Brabandt Date: Sat, 16 Oct 2021 11:58:55 +0100 Subject: [PATCH] patch 8.2.3517: TextChanged does not trigger after TextChangedI Problem: TextChanged does not trigger after TextChangedI. Solution: Store the tick separately for TextChangedI. (Christian Brabandt, closes #8968, closes #8932) --- src/buffer.c | 1 + src/bufwrite.c | 4 ++-- src/edit.c | 12 ++++++------ src/structs.h | 6 +++--- src/testdir/test_autocmd.vim | 38 ++++++++++++++++++++++++++++++++++++ src/version.c | 2 ++ 6 files changed, 52 insertions(+), 11 deletions(-) diff --git a/src/buffer.c b/src/buffer.c index 56c1bf2f4..86dc88687 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -327,6 +327,7 @@ open_buffer( // Set last_changedtick to avoid triggering a TextChanged autocommand right // after it was added. curbuf->b_last_changedtick = CHANGEDTICK(curbuf); + curbuf->b_last_changedtick_i = CHANGEDTICK(curbuf); curbuf->b_last_changedtick_pum = CHANGEDTICK(curbuf); // require "!" to overwrite the file, because it wasn't read completely diff --git a/src/bufwrite.c b/src/bufwrite.c index 772d70767..0313e0ce3 100644 --- a/src/bufwrite.c +++ b/src/bufwrite.c @@ -2422,8 +2422,8 @@ restore_backup: && (overwriting || vim_strchr(p_cpo, CPO_PLUS) != NULL)) { unchanged(buf, TRUE, FALSE); - // b:changedtick is may be incremented in unchanged() but that - // should not trigger a TextChanged event. + // b:changedtick may be incremented in unchanged() but that should not + // trigger a TextChanged event. if (buf->b_last_changedtick + 1 == CHANGEDTICK(buf)) buf->b_last_changedtick = CHANGEDTICK(buf); u_unchanged(buf); diff --git a/src/edit.c b/src/edit.c index 4f8e37401..686c6d429 100644 --- a/src/edit.c +++ b/src/edit.c @@ -1477,9 +1477,9 @@ ins_redraw(int ready) // not busy with something last_cursormoved = curwin->w_cursor; } - // Trigger TextChangedI if b_changedtick differs. + // Trigger TextChangedI if b_changedtick_i differs. if (ready && has_textchangedI() - && curbuf->b_last_changedtick != CHANGEDTICK(curbuf) + && curbuf->b_last_changedtick_i != CHANGEDTICK(curbuf) && !pum_visible()) { aco_save_T aco; @@ -1489,15 +1489,15 @@ ins_redraw(int ready) // not busy with something aucmd_prepbuf(&aco, curbuf); apply_autocmds(EVENT_TEXTCHANGEDI, NULL, NULL, FALSE, curbuf); aucmd_restbuf(&aco); - curbuf->b_last_changedtick = CHANGEDTICK(curbuf); + curbuf->b_last_changedtick_i = CHANGEDTICK(curbuf); if (tick != CHANGEDTICK(curbuf)) // see ins_apply_autocmds() u_save(curwin->w_cursor.lnum, (linenr_T)(curwin->w_cursor.lnum + 1)); } - // Trigger TextChangedP if b_changedtick differs. When the popupmenu closes - // TextChangedI will need to trigger for backwards compatibility, thus use - // different b_last_changedtick* variables. + // Trigger TextChangedP if b_changedtick_pum differs. When the popupmenu + // closes TextChangedI will need to trigger for backwards compatibility, + // thus use different b_last_changedtick* variables. if (ready && has_textchangedP() && curbuf->b_last_changedtick_pum != CHANGEDTICK(curbuf) && pum_visible()) diff --git a/src/structs.h b/src/structs.h index 7dac95b30..83a13a765 100644 --- a/src/structs.h +++ b/src/structs.h @@ -2701,10 +2701,10 @@ struct file_buffer // incremented for each change, also for undo #define CHANGEDTICK(buf) ((buf)->b_ct_di.di_tv.vval.v_number) - varnumber_T b_last_changedtick; // b:changedtick when TextChanged or - // TextChangedI was last triggered. - varnumber_T b_last_changedtick_pum; // b:changedtick when TextChangedP was + varnumber_T b_last_changedtick; // b:changedtick when TextChanged was // last triggered. + varnumber_T b_last_changedtick_pum; // b:changedtick for TextChangedP + varnumber_T b_last_changedtick_i; // b:changedtick for TextChangedI int b_saving; // Set to TRUE if we are in the middle of // saving the buffer. diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim index db1efba12..7faa4551d 100644 --- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -1929,6 +1929,7 @@ func Test_ChangedP() let g:autocmd .= a:char endfunc + " TextChanged will not be triggered, only check that it isn't. au! TextChanged :call TextChangedAutocmd('N') au! TextChangedI :call TextChangedAutocmd('I') au! TextChangedP :call TextChangedAutocmd('P') @@ -2863,5 +2864,42 @@ func Test_autocmd_with_block() augroup END endfunc +" Test TextChangedI and TextChanged +func Test_Changed_ChangedI() + new + call test_override("char_avail", 1) + let [g:autocmd_i, g:autocmd_n] = ['',''] + + func! TextChangedAutocmdI(char) + let g:autocmd_{tolower(a:char)} = a:char .. b:changedtick + endfunc + + augroup Test_TextChanged + au! + au TextChanged :call TextChangedAutocmdI('N') + au TextChangedI :call TextChangedAutocmdI('I') + augroup END + + call feedkeys("ifoo\", 'tnix') + " TODO: Test test does not seem to trigger TextChanged autocommand, this + " requires running Vim in a terminal window. + " call assert_equal('N3', g:autocmd_n) + call assert_equal('I3', g:autocmd_i) + + call feedkeys("yyp", 'tnix') + " TODO: Test test does not seem to trigger TextChanged autocommand. + " call assert_equal('N4', g:autocmd_n) + call assert_equal('I3', g:autocmd_i) + + " CleanUp + call test_override("char_avail", 0) + au! TextChanged + au! TextChangedI + augroup! Test_TextChanged + delfu TextChangedAutocmdI + unlet! g:autocmd_i g:autocmd_n + + bw! +endfunc " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index dfe5139a9..d142759e5 100644 --- a/src/version.c +++ b/src/version.c @@ -757,6 +757,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3517, /**/ 3516, /**/ -- 2.40.0