Mercurial > vim
changeset 15022:f3b4cd98944c v8.1.0522
patch 8.1.0522: :terminal does not show trailing empty lines
commit https://github.com/vim/vim/commit/f3aea59afa23304266dfd0dd26b5d8cc70a21331
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Nov 11 22:18:21 2018 +0100
patch 8.1.0522: :terminal does not show trailing empty lines
Problem: :terminal does not show trailing empty lines.
Solution: Add empty lines. (Hirohito Higashi, closes https://github.com/vim/vim/issues/3605)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 11 Nov 2018 22:30:05 +0100 |
parents | 67c54109768a |
children | c6fe8685e092 |
files | src/terminal.c src/testdir/test_terminal.vim src/version.c |
diffstat | 3 files changed, 33 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/terminal.c +++ b/src/terminal.c @@ -1592,6 +1592,15 @@ update_snapshot(term_T *term) } } + // Add trailing empty lines. + for (pos.row = term->tl_scrollback.ga_len; + pos.row < term->tl_scrollback_scrolled + term->tl_cursor_pos.row; + ++pos.row) + { + if (add_empty_scrollback(term, &fill_attr, 0) == OK) + add_scrollback_line_to_buffer(term, (char_u *)"", 0); + } + term->tl_dirty_snapshot = FALSE; #ifdef FEAT_TIMERS term->tl_timer_set = FALSE;
--- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -1658,3 +1658,25 @@ func Test_terminal_hidden_and_close() call WaitForAssert({-> assert_false(bufexists(bnr))}) call assert_equal(1, winnr('$')) endfunc + +func Test_terminal_does_not_truncate_last_newlines() + let cmd = has('win32') ? 'type' : 'cat' + let contents = [ + \ [ 'One', '', 'X' ], + \ [ 'Two', '', '' ], + \ [ 'Three' ] + repeat([''], 30) + \ ] + + for c in contents + call writefile(c, 'Xfile') + exec 'term' cmd 'Xfile' + let bnr = bufnr('$') + call assert_equal('terminal', getbufvar(bnr, '&buftype')) + call WaitForAssert({-> assert_equal('finished', term_getstatus(bnr))}) + sleep 50m + call assert_equal(c, getline(1, line('$'))) + quit + endfor + + call delete('Xfile') +endfunc