mirror of
https://github.com/neovim/neovim.git
synced 2024-12-23 20:55:18 -07:00
vim-patch:9.1.0033: Insert mode not stopped if closing prompt buffer modifies hidden buffer (#27051)
Problem: Insert mode not stopped if an autocommand modifies a hidden
buffer while closing a prompt buffer.
Solution: Don't set b_prompt_insert if stop_insert_mode is already set.
(zeertzjq)
closes: vim/vim#13872
96958366ad
This commit is contained in:
parent
bf4b805516
commit
d5e1bc5706
@ -2477,7 +2477,7 @@ void leaving_window(win_T *const win)
|
||||
// When leaving the window (or closing the window) was done from a
|
||||
// callback we need to break out of the Insert mode loop and restart Insert
|
||||
// mode when entering the window again.
|
||||
if (State & MODE_INSERT) {
|
||||
if ((State & MODE_INSERT) && !stop_insert_mode) {
|
||||
stop_insert_mode = true;
|
||||
if (win->w_buffer->b_prompt_insert == NUL) {
|
||||
win->w_buffer->b_prompt_insert = 'A';
|
||||
|
@ -4,6 +4,7 @@ local feed = helpers.feed
|
||||
local source = helpers.source
|
||||
local clear = helpers.clear
|
||||
local command = helpers.command
|
||||
local expect = helpers.expect
|
||||
local poke_eventloop = helpers.poke_eventloop
|
||||
local meths = helpers.meths
|
||||
local eq = helpers.eq
|
||||
@ -263,4 +264,24 @@ describe('prompt buffer', function()
|
||||
command('call DoAppend()')
|
||||
eq({ mode = 'i', blocking = false }, meths.get_mode())
|
||||
end)
|
||||
|
||||
-- oldtest: Test_prompt_close_modify_hidden()
|
||||
it('modifying hidden buffer does not prevent prompt buffer mode change', function()
|
||||
source([[
|
||||
file hidden
|
||||
set bufhidden=hide
|
||||
enew
|
||||
new prompt
|
||||
set buftype=prompt
|
||||
|
||||
inoremap <buffer> q <Cmd>bwipe!<CR>
|
||||
autocmd BufWinLeave prompt call setbufline('hidden', 1, 'Test')
|
||||
]])
|
||||
feed('a')
|
||||
eq({ mode = 'i', blocking = false }, meths.get_mode())
|
||||
feed('q')
|
||||
eq({ mode = 'n', blocking = false }, meths.get_mode())
|
||||
command('bwipe!')
|
||||
expect('Test')
|
||||
end)
|
||||
end)
|
||||
|
@ -302,4 +302,36 @@ func Test_prompt_appending_while_hidden()
|
||||
call StopVimInTerminal(buf)
|
||||
endfunc
|
||||
|
||||
" Modifying a hidden buffer while closing a prompt buffer should not prevent
|
||||
" stopping of Insert mode.
|
||||
func Test_prompt_close_modify_hidden()
|
||||
call CanTestPromptBuffer()
|
||||
|
||||
let script =<< trim END
|
||||
file hidden
|
||||
set bufhidden=hide
|
||||
enew
|
||||
new prompt
|
||||
set buftype=prompt
|
||||
|
||||
inoremap <buffer> q <Cmd>bwipe!<CR>
|
||||
autocmd BufWinLeave prompt call setbufline('hidden', 1, 'Test')
|
||||
END
|
||||
call writefile(script, 'XpromptCloseModifyHidden', 'D')
|
||||
|
||||
let buf = RunVimInTerminal('-S XpromptCloseModifyHidden', {'rows': 10})
|
||||
call TermWait(buf)
|
||||
|
||||
call term_sendkeys(buf, "a")
|
||||
call WaitForAssert({-> assert_match('-- INSERT --', term_getline(buf, 10))})
|
||||
|
||||
call term_sendkeys(buf, "q")
|
||||
call WaitForAssert({-> assert_notmatch('-- INSERT --', term_getline(buf, 10))})
|
||||
|
||||
call term_sendkeys(buf, ":bwipe!\<CR>")
|
||||
call WaitForAssert({-> assert_equal('Test', term_getline(buf, 1))})
|
||||
|
||||
call StopVimInTerminal(buf)
|
||||
endfunc
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
Loading…
Reference in New Issue
Block a user