alex/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-02-16 09:21:00 +10:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0048: Abort opening cmdwin if autocmds screw things up

Browse Source 
Problem:  Autocmds triggered from opening the cmdwin (in win_split and
          do_ecmd) can cause issues such as E199, as the current checks
          are insufficient.

Solution: Commands executed from the cmdwin apply to the old curwin/buf,
          so they should be kept in a "suspended" state; abort if
          they've changed. Also abort if cmdwin/buf was tampered with,
          and check that curwin is correct. Try to clean up the cmdwin
          buffer (only if hidden and non-current to simplify things; the
          same approach is used when closing cmdwin normally), and add a
          beep. (Sean Dewar)

Rename the old Test_cmdwin_interrupted() like in the patch (can be moved to
test_cmdwin.vim when v9.0.0027 is ported).
Move the error message to `e_active_window_or_buffer_changed_or_deleted`.

43b395ec2e
This commit is contained in:
Sean Dewar
2023-08-11 10:09:51 +01:00
parent cf140fb25b
commit 7bb0dd08db
3 changed files with 103 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/old/testdir/test_cmdline.vim
View File

@@ -1885,7 +1885,7 @@ func Test_cmdwin_tabpage()
tabclose!
endfunc
func Test_cmdwin_interrupted()
func Test_cmdwin_interrupted_more_prompt()
CheckScreendump
" aborting the :smile output caused the cmdline window to use the current

66
test/old/testdir/test_cmdwin.vim
View File

@@ -121,9 +121,75 @@ func Test_cmdwin_temp_curwin()
call feedkeys("q::call CheckCmdWin()\<CR>:call win_execute(win_getid(winnr('#')), 'call CheckOtherWin()')\<CR>:q<CR>", 'ntx')
%bwipe!
delfunc CheckWraps
delfunc CheckCmdWin
delfunc CheckOtherWin
endfunc
func Test_cmdwin_interrupted()
func CheckInterrupted()
call feedkeys("q::call assert_equal('', getcmdwintype())\<CR>:call assert_equal('', getcmdtype())\<CR>:q<CR>", 'ntx')
endfunc
augroup CmdWin
" While opening the cmdwin's split:
" Close the cmdwin's window.
au WinEnter * ++once quit
call CheckInterrupted()
" Close the old window.
au WinEnter * ++once execute winnr('#') 'quit'
call CheckInterrupted()
" Switch back to the old window.
au WinEnter * ++once wincmd p
call CheckInterrupted()
" Change the old window's buffer.
au WinEnter * ++once call win_execute(win_getid(winnr('#')), 'enew')
call CheckInterrupted()
" Using BufLeave autocmds as cmdwin restrictions do not apply to them when
" fired from opening the cmdwin...
" After opening the cmdwin's split, while creating the cmdwin's buffer:
" Delete the cmdwin's buffer.
au BufLeave * ++once bwipe
call CheckInterrupted()
" Close the cmdwin's window.
au BufLeave * ++once quit
call CheckInterrupted()
" Close the old window.
au BufLeave * ++once execute winnr('#') 'quit'
call CheckInterrupted()
" Switch to a different window.
au BufLeave * ++once split
call CheckInterrupted()
" Change the old window's buffer.
au BufLeave * ++once call win_execute(win_getid(winnr('#')), 'enew')
call CheckInterrupted()
" However, changing the current buffer is OK and does not interrupt.
au BufLeave * ++once edit other
call feedkeys("q::let t=getcmdwintype()\<CR>:let b=bufnr()\<CR>:clo<CR>", 'ntx')
call assert_equal(':', t)
call assert_equal(1, bufloaded('other'))
call assert_notequal(b, bufnr('other'))
augroup END
" No autocmds should remain, but clear the augroup to be sure.
augroup CmdWin
au!
augroup END
%bwipe!
delfunc CheckInterrupted
endfunc
" vim: shiftwidth=2 sts=2 expandtab