patch 9.1.1108: 'smoothscroll' gets stuck with 'listchars' "eol"
Problem: 'smoothscroll' gets stuck with 'listchars' "eol".
Solution: Count size of 'listchars' "eol" in line size when scrolling.
(zeertzjq)
related: neovim/neovim#32405
closes: #16627
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/testdir/test_scroll_opt.vim b/src/testdir/test_scroll_opt.vim
index 9c4e29e..7573db9 100644
--- a/src/testdir/test_scroll_opt.vim
+++ b/src/testdir/test_scroll_opt.vim
@@ -1216,4 +1216,59 @@
call StopVimInTerminal(buf)
endfunc
+func Test_smoothscroll_listchars_eol()
+ call NewWindow(10, 40)
+ setlocal list listchars=eol:$ scrolloff=0 smoothscroll
+ call setline(1, repeat('-', 40))
+ call append(1, repeat(['foobar'], 10))
+
+ normal! G
+ call assert_equal(2, line('w0'))
+ call assert_equal(0, winsaveview().skipcol)
+
+ exe "normal! \<C-Y>"
+ call assert_equal(1, line('w0'))
+ call assert_equal(40, winsaveview().skipcol)
+
+ exe "normal! \<C-Y>"
+ call assert_equal(1, line('w0'))
+ call assert_equal(0, winsaveview().skipcol)
+
+ exe "normal! \<C-Y>"
+ call assert_equal(1, line('w0'))
+ call assert_equal(0, winsaveview().skipcol)
+
+ exe "normal! \<C-E>"
+ call assert_equal(1, line('w0'))
+ call assert_equal(40, winsaveview().skipcol)
+
+ exe "normal! \<C-E>"
+ call assert_equal(2, line('w0'))
+ call assert_equal(0, winsaveview().skipcol)
+
+ for ve in ['', 'all', 'onemore']
+ let &virtualedit = ve
+ normal! gg
+ call assert_equal(1, line('w0'))
+ call assert_equal(0, winsaveview().skipcol)
+
+ exe "normal! \<C-E>"
+ redraw " redrawing should not cause another scroll
+ call assert_equal(1, line('w0'))
+ call assert_equal(40, winsaveview().skipcol)
+
+ exe "normal! \<C-E>"
+ redraw
+ call assert_equal(2, line('w0'))
+ call assert_equal(0, winsaveview().skipcol)
+
+ if ve != 'all'
+ call assert_equal([0, 2, 1, 0], getpos('.'))
+ endif
+ endfor
+
+ set virtualedit&
+ bwipe!
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab