diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-12-06 07:26:41 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-12-06 07:40:16 +0800 |
| commit | 6f9cda0f0a9d2e38654e4a0afc4701a356efb862 (patch) | |
| tree | 32642278e18da396f819c25b29ff8b67e07cfa32 | |
| parent | e120a049f0e6594b317819bbc883d9040729bc93 (diff) | |
| download | rneovim-6f9cda0f0a9d2e38654e4a0afc4701a356efb862.tar.gz rneovim-6f9cda0f0a9d2e38654e4a0afc4701a356efb862.tar.bz2 rneovim-6f9cda0f0a9d2e38654e4a0afc4701a356efb862.zip | |
vim-patch:8.2.4204: screenpos() has non-zero row for invisible text
Problem: screenpos() has non-zero row for invisible text.
Solution: Only add the window row when the text is visible. (closes vim/vim#9618)
https://github.com/vim/vim/commit/7924a17791217d50be5a91989a9641bf68e7a735
Co-authored-by: Bram Moolenaar <Bram@vim.org>
| -rw-r--r-- | src/nvim/move.c | 5 | ||||
| -rw-r--r-- | src/nvim/testdir/test_cursor_func.vim | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/move.c b/src/nvim/move.c index fecd8130f0..31671ce31d 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -924,7 +924,7 @@ void textpos2screenpos(win_T *wp, pos_T *pos, int *rowp, int *scolp, int *ccolp, if (pos->lnum >= wp->w_topline && pos->lnum <= wp->w_botline) { row = plines_m_win(wp, wp->w_topline, pos->lnum - 1) + 1; visible_row = true; - } else if (pos->lnum < wp->w_topline) { + } else if (!local || pos->lnum < wp->w_topline) { row = 0; } else { row = wp->w_height_inner; @@ -957,6 +957,7 @@ void textpos2screenpos(win_T *wp, pos_T *pos, int *rowp, int *scolp, int *ccolp, if (col >= 0 && col < wp->w_width && row + rowoff <= wp->w_height) { coloff = col - scol + (local ? 0 : wp->w_wincol + wp->w_wincol_off) + 1; + row += local ? 0 : wp->w_winrow + wp->w_winrow_off; } else { // character is left, right or below of the window scol = ccol = ecol = 0; @@ -967,7 +968,7 @@ void textpos2screenpos(win_T *wp, pos_T *pos, int *rowp, int *scolp, int *ccolp, } } } - *rowp = (local ? 0 : wp->w_winrow + wp->w_winrow_off) + row + rowoff; + *rowp = row + rowoff; *scolp = scol + coloff; *ccolp = ccol + coloff; *ecolp = ecol + coloff; diff --git a/src/nvim/testdir/test_cursor_func.vim b/src/nvim/testdir/test_cursor_func.vim index 0a88bf9db3..b08eb328b7 100644 --- a/src/nvim/testdir/test_cursor_func.vim +++ b/src/nvim/testdir/test_cursor_func.vim @@ -109,7 +109,7 @@ func Test_screenpos() \ 'col': wincol + 7, \ 'curscol': wincol + 7, \ 'endcol': wincol + 7}, winid->screenpos(line('$'), 8)) - call assert_equal({'row': winrow - 1, 'col': 0, 'curscol': 0, 'endcol': 0}, + call assert_equal({'row': 0, 'col': 0, 'curscol': 0, 'endcol': 0}, \ winid->screenpos(line('$'), 22)) close |