diff options
| -rw-r--r-- | src/nvim/buffer.c | 13 | ||||
| -rw-r--r-- | src/nvim/ex_cmds2.c | 16 | ||||
| -rw-r--r-- | test/functional/terminal/buffer_spec.lua | 22 |
3 files changed, 48 insertions, 3 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index 95eaf4dcf6..81bbc56eb9 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -1172,14 +1172,21 @@ do_buffer ( } } else { if (buf->terminal) { - EMSG2(_("E89: %s will be killed(add ! to override)"), - (char *)buf->b_fname); + if (p_confirm || cmdmod.confirm) { + if (!dialog_close_terminal(buf)) { + return FAIL; + } + } else { + EMSG2(_("E89: %s will be killed(add ! to override)"), + (char *)buf->b_fname); + return FAIL; + } } else { EMSGN(_("E89: No write since last change for buffer %" PRId64 " (add ! to override)"), buf->b_fnum); + return FAIL; } - return FAIL; } } diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c index 46a7c869e1..f07bc0e137 100644 --- a/src/nvim/ex_cmds2.c +++ b/src/nvim/ex_cmds2.c @@ -1339,6 +1339,22 @@ void dialog_changed(buf_T *buf, int checkall) } } +/// Ask the user whether to close the terminal buffer or not. +/// +/// @param buf The terminal buffer. +/// @return bool Whether to close the buffer or not. +bool dialog_close_terminal(buf_T *buf) +{ + char_u buff[DIALOG_MSG_SIZE]; + + dialog_msg(buff, _("Close \"%s\"?"), + (buf->b_fname != NULL) ? buf->b_fname : (char_u *)"?"); + + int ret = vim_dialog_yesnocancel(VIM_QUESTION, NULL, buff, 1); + + return (ret == VIM_YES) ? true : false; +} + /// Return true if the buffer "buf" can be abandoned, either by making it /// hidden, autowriting it or unloading it. bool can_abandon(buf_T *buf, int forceit) diff --git a/test/functional/terminal/buffer_spec.lua b/test/functional/terminal/buffer_spec.lua index 4ce33fef7b..c290031fbe 100644 --- a/test/functional/terminal/buffer_spec.lua +++ b/test/functional/terminal/buffer_spec.lua @@ -201,6 +201,28 @@ describe('terminal buffer', function() feed([[<C-\><C-n>]]) feed_command('bdelete!') end) + + describe('handles confirmations', function() + it('with :confirm', function() + feed_command('terminal') + feed('<c-\\><c-n>') + feed_command('confirm bdelete') + screen:expect('Close "term://', nil, true, nil, true) + end) + + it('with &confirm', function() + feed_command('terminal') + feed('<c-\\><c-n>') + feed_command('bdelete') + screen:expect('E89', nil, true, nil, true) + feed('<cr>') + eq('terminal', eval('&buftype')) + feed_command('set confirm | bdelete') + screen:expect('Close "term://', nil, true, nil, true) + feed('y') + neq('terminal', eval('&buftype')) + end) + end) end) describe('No heap-buffer-overflow when using', function() |