From 49ede0a68f1f8fd46dc9715fb1f332a13d13dbe3 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 5 Jun 2023 06:33:43 +0800 Subject: vim-patch:9.0.1600: screenpos() does not take w_skipcol into account Problem: screenpos() does not take w_skipcol into account. Solution: Subtract w_skipcol from column. (closes vim/vim#12486, closes vim/vim#12476) https://github.com/vim/vim/commit/f0e68c0e2a3539f899e737e5b167622fe081fbbd --- test/old/testdir/test_cursor_func.vim | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'test/old/testdir/test_cursor_func.vim') diff --git a/test/old/testdir/test_cursor_func.vim b/test/old/testdir/test_cursor_func.vim index 239eff5db5..7c8b691f66 100644 --- a/test/old/testdir/test_cursor_func.vim +++ b/test/old/testdir/test_cursor_func.vim @@ -125,7 +125,40 @@ func Test_screenpos() \ 'curscol': wincol + 7, \ 'endcol': wincol + 7}, winid->screenpos(line('$'), 8)) call assert_equal({'row': 0, 'col': 0, 'curscol': 0, 'endcol': 0}, - \ winid->screenpos(line('$'), 22)) + \ winid->screenpos(line('$'), 22)) + + 1split + normal G$ + redraw + call assert_equal({'row': winrow + 0, + \ 'col': wincol + 20 - 1, + \ 'curscol': wincol + 20 - 1, + \ 'endcol': wincol + 20 - 1}, + \ screenpos(win_getid(), line('.'), col('.'))) + + " w_skipcol should be subtracted + setlocal nowrap + normal 050zl$ + call assert_equal({'row': winrow + 0, + \ 'col': wincol + 10 - 1, + \ 'curscol': wincol + 10 - 1, + \ 'endcol': wincol + 10 - 1}, + \ screenpos(win_getid(), line('.'), col('.'))) + + " w_skipcol should only matter for the topline +" FIXME: This fails because pline_m_win() does not take w_skipcol into +" account. If it does, then other tests fail. +" wincmd + +" setlocal wrap smoothscroll +" call setline(line('$') + 1, 'last line') +" exe "normal \G$" +" redraw +" call assert_equal({'row': winrow + 1, +" \ 'col': wincol + 9 - 1, +" \ 'curscol': wincol + 9 - 1, +" \ 'endcol': wincol + 9 - 1}, +" \ screenpos(win_getid(), line('.'), col('.'))) + close close call assert_equal({}, screenpos(999, 1, 1)) -- cgit From 57fef392d265e2ef40c8c514749d658cb4d8d22a Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Mon, 5 Jun 2023 06:40:39 +0800 Subject: vim-patch:9.0.1607: screenpos() returns wrong row with diff filler lines Problem: screenpos() returns wrong row with diff filler lines. Solution: Only add filler lines when appropriate. Also don't add the 'smoothscroll' marker when w_skipcol is zero. (closes vim/vim#12485, closes vim/vim#12484) https://github.com/vim/vim/commit/55daae392157823dc5434e6be1344f4336bfe96f --- test/old/testdir/test_cursor_func.vim | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'test/old/testdir/test_cursor_func.vim') diff --git a/test/old/testdir/test_cursor_func.vim b/test/old/testdir/test_cursor_func.vim index 7c8b691f66..f73bd4f2b9 100644 --- a/test/old/testdir/test_cursor_func.vim +++ b/test/old/testdir/test_cursor_func.vim @@ -130,13 +130,14 @@ func Test_screenpos() 1split normal G$ redraw + " w_skipcol should be subtracted call assert_equal({'row': winrow + 0, \ 'col': wincol + 20 - 1, \ 'curscol': wincol + 20 - 1, \ 'endcol': wincol + 20 - 1}, \ screenpos(win_getid(), line('.'), col('.'))) - " w_skipcol should be subtracted + " w_leftcol should be subtracted setlocal nowrap normal 050zl$ call assert_equal({'row': winrow + 0, @@ -203,6 +204,19 @@ func Test_screenpos_diff() windo diffthis wincmd w call assert_equal(#{col: 3, row: 7, endcol: 3, curscol: 3}, screenpos(0, 4, 1)) + call assert_equal(#{col: 3, row: 8, endcol: 3, curscol: 3}, screenpos(0, 5, 1)) + exe "normal! 3\" + call assert_equal(#{col: 3, row: 4, endcol: 3, curscol: 3}, screenpos(0, 4, 1)) + call assert_equal(#{col: 3, row: 5, endcol: 3, curscol: 3}, screenpos(0, 5, 1)) + exe "normal! \" + call assert_equal(#{col: 3, row: 3, endcol: 3, curscol: 3}, screenpos(0, 4, 1)) + call assert_equal(#{col: 3, row: 4, endcol: 3, curscol: 3}, screenpos(0, 5, 1)) + exe "normal! \" + call assert_equal(#{col: 3, row: 2, endcol: 3, curscol: 3}, screenpos(0, 4, 1)) + call assert_equal(#{col: 3, row: 3, endcol: 3, curscol: 3}, screenpos(0, 5, 1)) + exe "normal! \" + call assert_equal(#{col: 3, row: 1, endcol: 3, curscol: 3}, screenpos(0, 4, 1)) + call assert_equal(#{col: 3, row: 2, endcol: 3, curscol: 3}, screenpos(0, 5, 1)) windo diffoff bwipe! -- cgit