kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 18:55:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18189 from zeertzjq/vim-8.2.4795

Browse Source 
vim-patch:8.2.{4795,4796,4801}: 'cursorbind' scrolling depends on whether 'cursorline' is set
This commit is contained in:
zeertzjq 2022-04-21 06:57:13 +08:00 committed by GitHub
commit c6dcc6acd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 128 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/move.c
View File

@ -2279,9 +2279,7 @@ void do_check_cursorbind(void)
int restart_edit_save = restart_edit;
restart_edit = true;
check_cursor();
if (win_cursorline_standout(curwin) || curwin->w_p_cuc) {
validate_cursor();
}
validate_cursor();
restart_edit = restart_edit_save;
}
// Correct cursor for multi-byte character.

36
src/nvim/testdir/test_cursorline.vim
View File

@ -314,5 +314,41 @@ func Test_cursorline_screenline_update()
call delete('Xcul_screenline')
endfunc
func Test_cursorline_cursorbind_horizontal_scroll()
CheckScreendump
let lines =<< trim END
call setline(1, 'aa bb cc dd ee ff gg hh ii jj kk ll mm' ..
\ ' nn oo pp qq rr ss tt uu vv ww xx yy zz')
set nowrap
" The following makes the cursor apparent on the screen dump
set sidescroll=1 cursorcolumn
" add empty lines, required for cursorcolumn
call append(1, ['','','',''])
20vsp
windo :set cursorbind
END
call writefile(lines, 'Xhor_scroll')
let buf = RunVimInTerminal('-S Xhor_scroll', #{rows: 8})
call term_sendkeys(buf, "20l")
call VerifyScreenDump(buf, 'Test_hor_scroll_1', {})
call term_sendkeys(buf, "10l")
call VerifyScreenDump(buf, 'Test_hor_scroll_2', {})
call term_sendkeys(buf, ":windo :set cursorline\<cr>")
call term_sendkeys(buf, "0")
call term_sendkeys(buf, "20l")
call VerifyScreenDump(buf, 'Test_hor_scroll_3', {})
call term_sendkeys(buf, "10l")
call VerifyScreenDump(buf, 'Test_hor_scroll_4', {})
call term_sendkeys(buf, ":windo :set nocursorline nocursorcolumn\<cr>")
call term_sendkeys(buf, "0")
call term_sendkeys(buf, "40l")
call VerifyScreenDump(buf, 'Test_hor_scroll_5', {})
call StopVimInTerminal(buf)
call delete('Xhor_scroll')
endfunc
" vim: shiftwidth=2 sts=2 expandtab

91
test/functional/options/cursorbind_spec.lua Normal file
View File

@ -0,0 +1,91 @@
local helpers = require('test.functional.helpers')(after_each)
local Screen = require('test.functional.ui.screen')
local clear = helpers.clear
local command = helpers.command
local exec = helpers.exec
local feed = helpers.feed
before_each(clear)
describe("'cursorbind'", function()
it("behaves consistently whether 'cursorline' is set or not vim-patch:8.2.4795", function()
local screen = Screen.new(60, 8)
screen:set_default_attr_ids({
[1] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
[2] = {bold = true, reverse = true}, -- StatusLine
[3] = {reverse = true}, -- StatusLineNC, VertSplit
[4] = {background = Screen.colors.Grey90}, -- CursorLine, CursorColumn
})
screen:attach()
exec([[
call setline(1, 'aa bb cc dd ee ff gg hh ii jj kk ll mm' ..
\ ' nn oo pp qq rr ss tt uu vv ww xx yy zz')
set nowrap
" The following makes the cursor apparent on the screen dump
set sidescroll=1 cursorcolumn
" add empty lines, required for cursorcolumn
call append(1, ['','','',''])
20vsp
windo :set cursorbind
]])
feed('20l')
screen:expect([[
a bb cc dd ee ff gg {3:│}aa bb cc dd ee ff gg^ hh ii jj kk ll mm |
{4: }{3:│} {4: } |
{4: }{3:│} {4: } |
{4: }{3:│} {4: } |
{4: }{3:│} {4: } |
{1:~ }{3:│}{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }|
|
]])
feed('10l')
screen:expect([[
hh ii jj kk ll mm n{3:│}aa bb cc dd ee ff gg hh ii jj ^kk ll mm |
{4: } {3:│} {4: } |
{4: } {3:│} {4: } |
{4: } {3:│} {4: } |
{4: } {3:│} {4: } |
{1:~ }{3:│}{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }|
|
]])
command('windo :set cursorline')
feed('0')
feed('20l')
screen:expect([[
{4:a bb cc dd ee ff gg }{3:│}{4:aa bb cc dd ee ff gg^ hh ii jj kk ll mm }|
{4: }{3:│} {4: } |
{4: }{3:│} {4: } |
{4: }{3:│} {4: } |
{4: }{3:│} {4: } |
{1:~ }{3:│}{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }|
|
]])
feed('10l')
screen:expect([[
{4: hh ii jj kk ll mm n}{3:│}{4:aa bb cc dd ee ff gg hh ii jj ^kk ll mm }|
{4: } {3:│} {4: } |
{4: } {3:│} {4: } |
{4: } {3:│} {4: } |
{4: } {3:│} {4: } |
{1:~ }{3:│}{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }|
|
]])
command('windo :set nocursorline nocursorcolumn')
feed('0')
feed('40l')
screen:expect([[
kk ll mm nn oo pp qq{3:│} bb cc dd ee ff gg hh ii jj kk ll mm n^n|
{3:│} |
{3:│} |
{3:│} |
{3:│} |
{1:~ }{3:│}{1:~ }|
{3:[No Name] [+] }{2:[No Name] [+] }|
|
]])
end)
end)