diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-12-06 07:41:33 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-12-06 07:51:32 +0800 |
| commit | 10af0549df7ac4ea9907b34624228755b9752318 (patch) | |
| tree | 9e113f5daa3a13d8f20e543af113c402ea562fa9 | |
| parent | 6f9cda0f0a9d2e38654e4a0afc4701a356efb862 (diff) | |
| download | rneovim-10af0549df7ac4ea9907b34624228755b9752318.tar.gz rneovim-10af0549df7ac4ea9907b34624228755b9752318.tar.bz2 rneovim-10af0549df7ac4ea9907b34624228755b9752318.zip | |
vim-patch:8.2.4389: screenpos() does not handle a position in a closed fold
Problem: screenpos() does not handle a position in a closed fold.
Solution: Check if the position is inside a closed fold. (closes vim/vim#9778)
https://github.com/vim/vim/commit/4556a2e8681c5c98fb4c7ca0a016924a69b4452a
Co-authored-by: Bram Moolenaar <Bram@vim.org>
| -rw-r--r-- | src/nvim/move.c | 10 | ||||
| -rw-r--r-- | src/nvim/testdir/test_cursor_func.vim | 22 |
2 files changed, 28 insertions, 4 deletions
diff --git a/src/nvim/move.c b/src/nvim/move.c index 31671ce31d..dda5e33d2b 100644 --- a/src/nvim/move.c +++ b/src/nvim/move.c @@ -920,9 +920,12 @@ void textpos2screenpos(win_T *wp, pos_T *pos, int *rowp, int *scolp, int *ccolp, int rowoff = 0; colnr_T coloff = 0; bool visible_row = false; + bool is_folded = false; if (pos->lnum >= wp->w_topline && pos->lnum <= wp->w_botline) { - row = plines_m_win(wp, wp->w_topline, pos->lnum - 1) + 1; + linenr_T lnum = pos->lnum; + is_folded = hasFoldingWin(wp, lnum, &lnum, NULL, true, NULL); + row = plines_m_win(wp, wp->w_topline, lnum - 1) + 1; visible_row = true; } else if (!local || pos->lnum < wp->w_topline) { row = 0; @@ -933,7 +936,10 @@ void textpos2screenpos(win_T *wp, pos_T *pos, int *rowp, int *scolp, int *ccolp, bool existing_row = (pos->lnum > 0 && pos->lnum <= wp->w_buffer->b_ml.ml_line_count); - if ((local || visible_row) && existing_row) { + if (is_folded) { + row += local ? 0 : wp->w_winrow + wp->w_winrow_off; + coloff = (local ? 0 : wp->w_wincol + wp->w_wincol_off) + 1; + } else if ((local || visible_row) && existing_row) { colnr_T off; colnr_T col; int width; diff --git a/src/nvim/testdir/test_cursor_func.vim b/src/nvim/testdir/test_cursor_func.vim index b08eb328b7..ad78adfc09 100644 --- a/src/nvim/testdir/test_cursor_func.vim +++ b/src/nvim/testdir/test_cursor_func.vim @@ -1,7 +1,10 @@ " Tests for cursor() and other functions that get/set the cursor position +source check.vim + func Test_wrong_arguments() call assert_fails('call cursor(1. 3)', 'E474:') + call assert_fails('call cursor(v:_null_list)', 'E474:') endfunc func Test_move_cursor() @@ -118,14 +121,29 @@ func Test_screenpos() bwipe! set display& - call assert_equal({'col': 1, 'row': 1, 'endcol': 1, 'curscol': 1}, screenpos(win_getid(), 1, 1)) + call assert_equal(#{col: 1, row: 1, endcol: 1, curscol: 1}, screenpos(win_getid(), 1, 1)) " nmenu WinBar.TEST : setlocal winbar=TEST - call assert_equal({'col': 1, 'row': 2, 'endcol': 1, 'curscol': 1}, screenpos(win_getid(), 1, 1)) + call assert_equal(#{col: 1, row: 2, endcol: 1, curscol: 1}, screenpos(win_getid(), 1, 1)) " nunmenu WinBar.TEST setlocal winbar& endfunc +func Test_screenpos_fold() + CheckFeature folding + + enew! + call setline(1, range(10)) + 3,5fold + redraw + call assert_equal(2, screenpos(1, 2, 1).row) + call assert_equal(#{col: 1, row: 3, endcol: 1, curscol: 1}, screenpos(1, 3, 1)) + call assert_equal(3, screenpos(1, 4, 1).row) + call assert_equal(3, screenpos(1, 5, 1).row) + call assert_equal(4, screenpos(1, 6, 1).row) + bwipe! +endfunc + func Test_screenpos_number() rightbelow new rightbelow 73vsplit |