diff options
| -rw-r--r-- | src/nvim/edit.c | 2 | ||||
| -rw-r--r-- | test/functional/autocmd/textchanged_spec.lua | 11 | ||||
| -rw-r--r-- | test/old/testdir/test_autocmd.vim | 21 |
3 files changed, 18 insertions, 16 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 0326096486..220b92d099 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -367,7 +367,7 @@ static void insert_enter(InsertState *s) // ins_redraw() triggers TextChangedI only when no characters // are in the typeahead buffer, so reset curbuf->b_last_changedtick // if the TextChangedI was not blocked by char_avail() (e.g. using :norm!) - // and the TextChangedI autocommand has been triggered + // and the TextChangedI autocommand has been triggered. if (!char_avail() && curbuf->b_last_changedtick_i == buf_get_changedtick(curbuf)) { curbuf->b_last_changedtick = buf_get_changedtick(curbuf); } diff --git a/test/functional/autocmd/textchanged_spec.lua b/test/functional/autocmd/textchanged_spec.lua index 8d8058da70..4abf52fa7a 100644 --- a/test/functional/autocmd/textchanged_spec.lua +++ b/test/functional/autocmd/textchanged_spec.lua @@ -194,17 +194,14 @@ end) -- oldtest: Test_Changed_ChangedI_2() it('TextChanged is triggered after mapping that enters & exits Insert mode', function() exec([[ - let [g:autocmd_i, g:autocmd_n] = ['',''] + let [g:autocmd_n, g:autocmd_i] = ['',''] - func! TextChangedAutocmdI(char) + func TextChangedAutocmd(char) let g:autocmd_{tolower(a:char)} = a:char .. b:changedtick endfunc - augroup Test_TextChanged - au! - au TextChanged <buffer> :call TextChangedAutocmdI('N') - au TextChangedI <buffer> :call TextChangedAutocmdI('I') - augroup END + au TextChanged <buffer> :call TextChangedAutocmd('N') + au TextChangedI <buffer> :call TextChangedAutocmd('I') nnoremap <CR> o<Esc> ]]) diff --git a/test/old/testdir/test_autocmd.vim b/test/old/testdir/test_autocmd.vim index 61de6775fb..ffc9a2274c 100644 --- a/test/old/testdir/test_autocmd.vim +++ b/test/old/testdir/test_autocmd.vim @@ -3530,11 +3530,6 @@ func Test_Changed_ChangedI() 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) - " If change is a mix of Normal and Insert modes, TextChangedI should trigger func s:validate_mixed_textchangedi(keys) call feedkeys("ifoo\<esc>", 'tnix') @@ -3959,20 +3954,30 @@ endfunc " Test TextChangedI and TextChanged func Test_Changed_ChangedI_2() + " Run this test in a terminal because it requires running the main loop. CheckRunVimInTerminal call writefile(['one', 'two', 'three'], 'XTextChangedI2', 'D') let before =<< trim END - autocmd TextChanged,TextChangedI * call writefile([b:changedtick], 'XTextChangedI3') + let [g:autocmd_n, g:autocmd_i] = ['',''] + + func TextChangedAutocmd(char) + let g:autocmd_{tolower(a:char)} = a:char .. b:changedtick + call writefile([g:autocmd_n, g:autocmd_i], 'XTextChangedI3') + endfunc + + au TextChanged <buffer> :call TextChangedAutocmd('N') + au TextChangedI <buffer> :call TextChangedAutocmd('I') + nnoremap <CR> o<Esc> call writefile([], 'XTextChangedI3') END call writefile(before, 'Xinit', 'D') let buf = RunVimInTerminal('-S Xinit XtextChangedI2', {}) + call WaitForAssert({-> assert_true(filereadable('XTextChangedI3'))}) call term_sendkeys(buf, "\<cr>") - call term_wait(buf) + call WaitForAssert({-> assert_equal(['N4', ''], readfile('XTextChangedI3'))}) call StopVimInTerminal(buf) - call assert_equal(['4'], readfile('XTextChangedI3')) call delete('XTextChangedI3') endfunc |