Mercurial > vim
changeset 30751:9889ff80547e v9.0.0710
patch 9.0.0710: quitting/unloading/hiding a terminal does not work properly
Commit: https://github.com/vim/vim/commit/4282633ba63f6e11f2fe42c4b7758dace184f30d
Author: Yee Cheng Chin <ychin.git@gmail.com>
Date: Mon Oct 10 11:46:16 2022 +0100
patch 9.0.0710: quitting/unloading/hiding a terminal does not work properly
Problem: Quitting/unloading/hiding a terminal buffer does not always work
properly.
Solution: Avoid that ":q!" leaves an empty buffer behind. ":bunload!" also
kills the job and unloads the buffer. ":hide" does not unload the
buffer. (Yee Cheng Chin, closes #11323)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 10 Oct 2022 13:00:05 +0200 |
| parents | e398624e45b4 |
| children | 93de7f063b1c |
| files | runtime/doc/terminal.txt src/buffer.c src/testdir/test_terminal.vim src/version.c |
| diffstat | 4 files changed, 46 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/terminal.txt +++ b/runtime/doc/terminal.txt @@ -288,9 +288,8 @@ way to kill or interrupt the job. For e So long as the job is running the window behaves like it contains a modified buffer. Trying to close the window with `CTRL-W :quit` fails. When using -`CTRL-W :quit!` the job is ended. The text in the window is lost. The buffer -still exists, but getting it in a window with `:buffer` will show an empty -buffer. +`CTRL-W :quit!` the job is ended. The text in the window is lost, the buffer +is deleted. With `CTRL-W :bunload!` the buffer remains but will be empty. Trying to close the window with `CTRL-W :close` also fails. Using `CTRL-W :close!` will close the window and make the buffer hidden.
--- a/src/buffer.c +++ b/src/buffer.c @@ -538,7 +538,8 @@ close_buffer( unload_buf = TRUE; #ifdef FEAT_TERMINAL - if (bt_terminal(buf) && (buf->b_nwindows == 1 || del_buf)) + // depending on how we get here b_nwindows may already be zero + if (bt_terminal(buf) && (buf->b_nwindows <= 1 || del_buf)) { CHECK_CURBUF; if (term_job_running(buf->b_term)) @@ -550,6 +551,11 @@ close_buffer( // Wiping out or unloading a terminal buffer kills the job. free_terminal(buf); + + // A terminal buffer is wiped out when job has finished. + del_buf = TRUE; + unload_buf = TRUE; + wipe_buf = TRUE; } else { @@ -565,10 +571,16 @@ close_buffer( } else { - // A terminal buffer is wiped out if the job has finished. - del_buf = TRUE; - unload_buf = TRUE; - wipe_buf = TRUE; + if (del_buf || unload_buf) + { + // A terminal buffer is wiped out if the job has finished. + // We only do this when there's an intention to unload the + // buffer. This way, :hide and other similar commands won't + // wipe the buffer. + del_buf = TRUE; + unload_buf = TRUE; + wipe_buf = TRUE; + } } CHECK_CURBUF; }
--- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -96,6 +96,16 @@ func Test_terminal_paste_register() unlet g:job endfunc +func Test_terminal_unload_buffer() + let buf = Run_shell_in_terminal({}) + call assert_fails(buf . 'bunload', 'E948:') + exe buf . 'bunload!' + call WaitForAssert({-> assert_equal('dead', job_status(g:job))}) + call assert_equal("", bufname(buf)) + + unlet g:job +endfunc + func Test_terminal_wipe_buffer() let buf = Run_shell_in_terminal({}) call assert_fails(buf . 'bwipe', 'E948:') @@ -202,7 +212,7 @@ func Test_terminal_quit() quit! call assert_notequal(buf, bufnr()) call WaitForAssert({-> assert_equal('dead', job_status(g:job))}) - exec buf .. 'bwipe!' + call assert_equal("", bufname(buf)) unlet g:job endfunc @@ -237,7 +247,7 @@ func Test_terminal_split_quit() quit! call WaitForAssert({-> assert_equal('dead', job_status(g:job))}) - exe buf . 'bwipe' + call assert_equal("", bufname(buf)) unlet g:job endfunc @@ -261,16 +271,28 @@ endfunc func Test_terminal_hide_buffer_job_finished() term echo hello let buf = bufnr() - setlocal bufhidden=hide call WaitForAssert({-> assert_equal('finished', term_getstatus(buf))}) + call assert_true(bufloaded(buf)) call assert_true(buflisted(buf)) + + " Test :hide + hide + call assert_true(bufloaded(buf)) + call assert_true(buflisted(buf)) + split + exe buf .. 'buf' + call assert_equal(buf, bufnr()) + + " Test bufhidden, which exercises a different code path + setlocal bufhidden=hide edit Xasdfasdf call assert_true(bufloaded(buf)) call assert_true(buflisted(buf)) exe buf .. 'buf' call assert_equal(buf, bufnr()) setlocal bufhidden= + edit Xasdfasdf call assert_false(bufloaded(buf)) call assert_false(buflisted(buf))