mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-05 19:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1612: "skipcol" not reset when using multi-byte characters (#23928)

Browse Source 
Problem:    "skipcol" not reset when using multi-byte characters.
Solution:   Compare with w_virtcol instead of w_cursor.col. (closes vim/vim#12457)

15d4747ffd

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq
2023-06-06 07:13:08 +08:00
committed by GitHub
parent 30e9ddfd05
commit 9deef1aa22
3 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/move.c
View File

@@ -1826,10 +1826,13 @@ void scroll_cursor_top(int min_scroll, int always)
}
}
check_topfill(curwin, false);
// TODO(vim): if the line doesn't fit may optimize w_skipcol
if (curwin->w_topline == curwin->w_cursor.lnum
&& curwin->w_skipcol >= curwin->w_cursor.col) {
reset_skipcol(curwin);
if (curwin->w_topline == curwin->w_cursor.lnum) {
validate_virtcol();
if (curwin->w_skipcol >= curwin->w_virtcol) {
// TODO(vim): if the line doesn't fit may optimize w_skipcol instead
// of making it zero
reset_skipcol(curwin);
}
}
if (curwin->w_topline != old_topline
|| curwin->w_skipcol != old_skipcol

18
test/functional/legacy/scroll_opt_spec.lua
View File

@@ -174,6 +174,24 @@ describe('smoothscroll', function()
screen:expect(s8)
end)
-- oldtest: Test_smoothscroll_multibyte()
it('works with multibyte characters', function()
screen:try_resize(40, 6)
exec([[
set scrolloff=0 smoothscroll
call setline(1, [repeat('ϛ', 45), repeat('2', 36)])
exe "normal G35l\<C-E>k"
]])
screen:expect([[
ϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛϛ^ϛϛϛϛϛ|
ϛϛϛϛϛ |
222222222222222222222222222222222222 |
~ |
~ |
|
]])
end)
-- oldtest: Test_smoothscroll_number()
it("works 'number' and 'cpo'+=n", function()
exec([[

15
test/old/testdir/test_scroll_opt.vim
View File

@@ -124,6 +124,21 @@ func Test_smoothscroll_CtrlE_CtrlY()
call StopVimInTerminal(buf)
endfunc
func Test_smoothscroll_multibyte()
CheckScreendump
let lines =<< trim END
set scrolloff=0 smoothscroll
call setline(1, [repeat('ϛ', 45), repeat('2', 36)])
exe "normal G35l\<C-E>k"
END
call writefile(lines, 'XSmoothMultibyte', 'D')
let buf = RunVimInTerminal('-S XSmoothMultibyte', #{rows: 6, cols: 40})
call VerifyScreenDump(buf, 'Test_smoothscroll_multi_1', {})
call StopVimInTerminal(buf)
endfunc
func Test_smoothscroll_number()
CheckScreendump