mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-11 22:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.2075: TextChangedI may not always trigger (#25808)

Browse Source 
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

4bca4897a1

Co-authored-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2023-10-28 10:42:18 +08:00
committed by GitHub
parent f97248db75
commit ac353e87ae
5 changed files with 75 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
test/functional/autocmd/textchanged_spec.lua
View File

@@ -4,6 +4,7 @@ local exec = helpers.exec
local command = helpers.command
local feed = helpers.feed
local eq = helpers.eq
local neq = helpers.neq
local eval = helpers.eval
local poke_eventloop = helpers.poke_eventloop
@@ -26,14 +27,14 @@ it('TextChangedI and TextChangedP autocommands', function()
poke_eventloop()
feed('<esc>')
-- TextChangedI triggers only if text is actually changed in Insert mode
eq('', eval('g:autocmd'))
command([[let g:autocmd = '']])
feed('S')
poke_eventloop()
feed('f')
poke_eventloop()
eq('I', eval('g:autocmd'))
command([[let g:autocmd = '']])
feed('S')
poke_eventloop()
feed('f')
poke_eventloop()
eq('II', eval('g:autocmd'))
feed('<esc>')
command([[let g:autocmd = '']])
@@ -43,7 +44,7 @@ it('TextChangedI and TextChangedP autocommands', function()
poke_eventloop()
feed('<C-N>')
poke_eventloop()
eq('IP', eval('g:autocmd'))
eq('IIP', eval('g:autocmd'))
feed('<esc>')
command([[let g:autocmd = '']])
@@ -55,7 +56,7 @@ it('TextChangedI and TextChangedP autocommands', function()
poke_eventloop()
feed('<C-N>')
poke_eventloop()
eq('IPP', eval('g:autocmd'))
eq('IIPP', eval('g:autocmd'))
feed('<esc>')
command([[let g:autocmd = '']])
@@ -69,7 +70,7 @@ it('TextChangedI and TextChangedP autocommands', function()
poke_eventloop()
feed('<C-N>')
poke_eventloop()
eq('IPPP', eval('g:autocmd'))
eq('IIPPP', eval('g:autocmd'))
feed('<esc>')
command([[let g:autocmd = '']])
@@ -84,7 +85,7 @@ it('TextChangedI and TextChangedP autocommands', function()
feed('<C-N>')
poke_eventloop()
feed('<C-N>')
eq('IPPPP', eval('g:autocmd'))
eq('IIPPPP', eval('g:autocmd'))
feed('<esc>')
eq({'foo', 'bar', 'foobar', 'foo'}, eval('getline(1, "$")'))
@@ -145,17 +146,37 @@ it('TextChangedI and TextChanged', function()
eq('', eval('g:autocmd_n'))
eq('I5', eval('g:autocmd_i'))
command([[call feedkeys("yyp", 'tnix')]])
feed('yyp')
eq('N6', eval('g:autocmd_n'))
eq('I5', eval('g:autocmd_i'))
-- TextChangedI should only trigger if change was done in Insert mode
command([[let g:autocmd_i = '']])
command([[call feedkeys("yypi\<esc>", 'tnix')]])
feed('yypi<esc>')
eq('', eval('g:autocmd_i'))
-- TextChanged should only trigger if change was done in Normal mode
command([[let g:autocmd_n = '']])
command([[call feedkeys("ibar\<esc>", 'tnix')]])
feed('ibar<esc>')
eq('', eval('g:autocmd_n'))
local function validate_mixed_textchangedi(keys)
feed('ifoo<esc>')
command([[let g:autocmd_i = '']])
command([[let g:autocmd_n = '']])
for _, s in ipairs(keys) do
feed(s)
poke_eventloop()
end
neq('', eval('g:autocmd_i'))
eq('', eval('g:autocmd_n'))
end
validate_mixed_textchangedi({'o', '<esc>'})
validate_mixed_textchangedi({'O', '<esc>'})
validate_mixed_textchangedi({'ciw', '<esc>'})
validate_mixed_textchangedi({'cc', '<esc>'})
validate_mixed_textchangedi({'C', '<esc>'})
validate_mixed_textchangedi({'s', '<esc>'})
validate_mixed_textchangedi({'S', '<esc>'})
end)

36
test/old/testdir/test_autocmd.vim
View File

@@ -2476,28 +2476,27 @@ func Test_ChangedP()
call cursor(3, 1)
let g:autocmd = ''
call feedkeys("o\<esc>", 'tnix')
" `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('I', g:autocmd)
let g:autocmd = ''
call feedkeys("Sf", 'tnix')
call assert_equal('II', g:autocmd)
let g:autocmd = ''
call feedkeys("Sf\<C-N>", 'tnix')
call assert_equal('IP', g:autocmd)
call assert_equal('IIP', g:autocmd)
let g:autocmd = ''
call feedkeys("Sf\<C-N>\<C-N>", 'tnix')
call assert_equal('IPP', g:autocmd)
call assert_equal('IIPP', g:autocmd)
let g:autocmd = ''
call feedkeys("Sf\<C-N>\<C-N>\<C-N>", 'tnix')
call assert_equal('IPPP', g:autocmd)
call assert_equal('IIPPP', g:autocmd)
let g:autocmd = ''
call feedkeys("Sf\<C-N>\<C-N>\<C-N>\<C-N>", 'tnix')
call assert_equal('IPPPP', g:autocmd)
call assert_equal('IIPPPP', g:autocmd)
call assert_equal(['foo', 'bar', 'foobar', 'foo'], getline(1, '$'))
" TODO: how should it handle completeopt=noinsert,noselect?
@@ -3489,6 +3488,25 @@ func Test_Changed_ChangedI()
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')
let g:autocmd_i = ''
let g:autocmd_n = ''
call feedkeys(a:keys, 'tnix')
call assert_notequal('', g:autocmd_i)
call assert_equal('', g:autocmd_n)
endfunc
call s:validate_mixed_textchangedi("o\<esc>")
call s:validate_mixed_textchangedi("O\<esc>")
call s:validate_mixed_textchangedi("ciw\<esc>")
call s:validate_mixed_textchangedi("cc\<esc>")
call s:validate_mixed_textchangedi("C\<esc>")
call s:validate_mixed_textchangedi("s\<esc>")
call s:validate_mixed_textchangedi("S\<esc>")
" CleanUp
call test_override("char_avail", 0)
au! TextChanged <buffer>