diff options
| author | Aufar Gilbran <aufargilbran@gmail.com> | 2020-10-02 14:10:18 +0800 |
|---|---|---|
| committer | Aufar Gilbran <aufargilbran@gmail.com> | 2020-10-07 23:41:50 +0800 |
| commit | a893593a9f54a0fbe84b467d43f11a841ecae2ee (patch) | |
| tree | faa538972bd0646706d7b78fbcb79769e04d46a7 | |
| parent | e852bad3a7f9ae8a85117785f3ad18954b1a74fa (diff) | |
| download | rneovim-a893593a9f54a0fbe84b467d43f11a841ecae2ee.tar.gz rneovim-a893593a9f54a0fbe84b467d43f11a841ecae2ee.tar.bz2 rneovim-a893593a9f54a0fbe84b467d43f11a841ecae2ee.zip | |
vim-patch:8.2.1488: text does not scroll when inserting above first line
Problem: Text does not scroll when inserting above first line.
Solution: Adjust off-by-one error. (Ken Takata, closes vim/vim#6739)
https://github.com/vim/vim/commit/9dc1917f42b23277e143fc58bbe27482b0b76bad
| -rw-r--r-- | src/nvim/screen.c | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_display.vim | 13 | ||||
| -rw-r--r-- | test/functional/legacy/display_spec.lua | 31 |
3 files changed, 45 insertions, 1 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c index fdd191163d..7c42f29a90 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -902,7 +902,7 @@ static void win_update(win_T *wp) if (mod_top != 0 && wp->w_topline == mod_top && (!wp->w_lines[0].wl_valid - || wp->w_topline == wp->w_lines[0].wl_lnum)) { + || wp->w_topline <= wp->w_lines[0].wl_lnum)) { // w_topline is the first changed line and window is not scrolled, // the scrolling from changed lines will be done further down. } else if (wp->w_lines[0].wl_valid diff --git a/src/nvim/testdir/test_display.vim b/src/nvim/testdir/test_display.vim index 98f6b17ccd..e853b046dc 100644 --- a/src/nvim/testdir/test_display.vim +++ b/src/nvim/testdir/test_display.vim @@ -208,3 +208,16 @@ func Test_visual_block_scroll() call StopVimInTerminal(buf) call delete(filename) endfunc + +func Test_display_scroll_at_topline() + " See test/functional/legacy/display_spec.lua + CheckScreendump + + let buf = RunVimInTerminal('', #{cols: 20}) + call term_sendkeys(buf, ":call setline(1, repeat('a', 21))\<CR>") + call term_wait(buf) + call term_sendkeys(buf, "O\<Esc>") + call VerifyScreenDump(buf, 'Test_display_scroll_at_topline', #{rows: 4}) + + call StopVimInTerminal(buf) +endfunc diff --git a/test/functional/legacy/display_spec.lua b/test/functional/legacy/display_spec.lua new file mode 100644 index 0000000000..aafcda67dc --- /dev/null +++ b/test/functional/legacy/display_spec.lua @@ -0,0 +1,31 @@ +local helpers = require('test.functional.helpers')(after_each) + +local Screen = require('test.functional.ui.screen') +local clear = helpers.clear +local wait = helpers.wait +local feed = helpers.feed +local feed_command = helpers.feed_command + +describe('display', function() + local screen + + it('scroll when modified at topline', function() + clear() + screen = Screen.new(20, 4) + screen:attach() + screen:set_default_attr_ids({ + [1] = {bold = true}, + }) + + feed_command([[call setline(1, repeat('a', 21))]]) + wait() + feed('O') + screen:expect([[ + ^ | + aaaaaaaaaaaaaaaaaaaa| + a | + {1:-- INSERT --} | + ]]) + end) +end) + |