Mercurial > vim
changeset 32537:da44475fb8f5 v9.0.1600
patch 9.0.1600: screenpos() does not take w_skipcol into account
Commit: https://github.com/vim/vim/commit/f0e68c0e2a3539f899e737e5b167622fe081fbbd
Author: zeertzjq <zeertzjq@outlook.com>
Date: Sat Jun 3 17:11:47 2023 +0100
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 https://github.com/vim/vim/issues/12486, closes https://github.com/vim/vim/issues/12476)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 03 Jun 2023 18:15:05 +0200 |
| parents | 443e418aa43a |
| children | e61860e4ef75 |
| files | src/move.c src/testdir/test_cursor_func.vim src/version.c |
| diffstat | 3 files changed, 39 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/move.c +++ b/src/move.c @@ -1479,6 +1479,9 @@ textpos2screenpos( col += off; width = wp->w_width - off + win_col_off2(wp); + if (pos->lnum == wp->w_topline) + col -= wp->w_skipcol; + // long line wrapping, adjust row if (wp->w_p_wrap && col >= (colnr_T)wp->w_width
--- a/src/testdir/test_cursor_func.vim +++ b/src/testdir/test_cursor_func.vim @@ -127,7 +127,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 \<C-E>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))