diff options
| -rw-r--r-- | src/nvim/move.c | 6 | ||||
| -rw-r--r-- | test/functional/legacy/scroll_opt_spec.lua | 42 | ||||
| -rw-r--r-- | test/old/testdir/test_scroll_opt.vim | 24 |
3 files changed, 69 insertions, 3 deletions
diff --git a/src/nvim/move.c b/src/nvim/move.c index 6fb6656472..5d817fd7aa 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -1345,6 +1345,7 @@ bool scrollup(long line_count, int byfold) int width2 = width1 + curwin_col_off2(); unsigned size = 0; linenr_T prev_topline = curwin->w_topline; + const colnr_T prev_skipcol = curwin->w_skipcol; if (do_sms) { size = linetabsize(curwin, curwin->w_topline); @@ -1396,8 +1397,9 @@ bool scrollup(long line_count, int byfold) } } - if (curwin->w_topline == prev_topline) { - // need to redraw even though w_topline didn't change + if (curwin->w_topline == prev_topline + || curwin->w_skipcol != prev_skipcol) { + // need to redraw because wl_size of the topline may now be invalid redraw_later(curwin, UPD_NOT_VALID); } } else { diff --git a/test/functional/legacy/scroll_opt_spec.lua b/test/functional/legacy/scroll_opt_spec.lua index 3320f96668..bb0ada15e9 100644 --- a/test/functional/legacy/scroll_opt_spec.lua +++ b/test/functional/legacy/scroll_opt_spec.lua @@ -865,6 +865,48 @@ describe('smoothscroll', function() ]]) end) + -- oldtest: Test_smoothscroll_multi_skipcol() + it('scrolling mulitple lines and stopping at non-zero skipcol', function() + screen:try_resize(40, 10) + screen:set_default_attr_ids({ + [0] = {foreground = Screen.colors.Blue, bold = true}, + [1] = {background = Screen.colors.Grey90}, + }) + exec([[ + setlocal cursorline scrolloff=0 smoothscroll + call setline(1, repeat([''], 9)) + call setline(3, repeat('a', 50)) + call setline(8, 'bbb') + call setline(9, 'ccc') + redraw + ]]) + screen:expect([[ + {1:^ }| + | + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa| + aaaaaaaaaa | + | + | + | + | + bbb | + | + ]]) + feed('3<C-E>') + screen:expect([[ + {0:<<<}{1:aaaaaa^a }| + | + | + | + | + bbb | + ccc | + {0:~ }| + {0:~ }| + | + ]]) + end) + it("works with virt_lines above and below", function() screen:try_resize(55, 7) exec([=[ diff --git a/test/old/testdir/test_scroll_opt.vim b/test/old/testdir/test_scroll_opt.vim index 48b8cb301f..1cd8bbfc84 100644 --- a/test/old/testdir/test_scroll_opt.vim +++ b/test/old/testdir/test_scroll_opt.vim @@ -780,7 +780,7 @@ func Test_smoothscroll_incsearch() call setline(14, 'bbbb') END call writefile(lines, 'XSmoothIncsearch', 'D') - let buf = RunVimInTerminal('-S XSmoothIncsearch', #{rows: 8, cols:40}) + let buf = RunVimInTerminal('-S XSmoothIncsearch', #{rows: 8, cols: 40}) call term_sendkeys(buf, "/b") call VerifyScreenDump(buf, 'Test_smooth_incsearch_1', {}) @@ -795,4 +795,26 @@ func Test_smoothscroll_incsearch() call StopVimInTerminal(buf) endfunc +" Test scrolling multiple lines and stopping at non-zero skipcol. +func Test_smoothscroll_multi_skipcol() + CheckScreendump + + let lines =<< trim END + setlocal cursorline scrolloff=0 smoothscroll + call setline(1, repeat([''], 9)) + call setline(3, repeat('a', 50)) + call setline(8, 'bbb') + call setline(9, 'ccc') + redraw + END + call writefile(lines, 'XSmoothMultiSkipcol', 'D') + let buf = RunVimInTerminal('-S XSmoothMultiSkipcol', #{rows: 10, cols: 40}) + call VerifyScreenDump(buf, 'Test_smooth_multi_skipcol_1', {}) + + call term_sendkeys(buf, "3\<C-E>") + call VerifyScreenDump(buf, 'Test_smooth_multi_skipcol_2', {}) + + call StopVimInTerminal(buf) +endfunc + " vim: shiftwidth=2 sts=2 expandtab |