diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-02-15 13:40:17 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-02-15 13:40:17 +0000 |
commit | 4556a2e8681c5c98fb4c7ca0a016924a69b4452a (patch) | |
tree | 7f5cb71bb3b4713c2fc9a10465cf320834c063c9 /src/move.c | |
parent | 7745f14ef324a7134b2f26a47451cf5032f44b89 (diff) | |
download | vim-git-4556a2e8681c5c98fb4c7ca0a016924a69b4452a.tar.gz |
patch 8.2.4389: screenpos() does not handle a position in a closed foldv8.2.4389
Problem: screenpos() does not handle a position in a closed fold.
Solution: Check if the position is inside a closed fold. (closes #9778)
Diffstat (limited to 'src/move.c')
-rw-r--r-- | src/move.c | 71 |
1 files changed, 43 insertions, 28 deletions
diff --git a/src/move.c b/src/move.c index f52e4c071..1c88e6ebc 100644 --- a/src/move.c +++ b/src/move.c @@ -1236,39 +1236,54 @@ textpos2screenpos( if (pos->lnum >= wp->w_topline && pos->lnum <= wp->w_botline) { - colnr_T off; - colnr_T col; - int width; - - row = plines_m_win(wp, wp->w_topline, pos->lnum - 1) + 1; - getvcol(wp, pos, &scol, &ccol, &ecol); - - // similar to what is done in validate_cursor_col() - col = scol; - off = win_col_off(wp); - col += off; - width = wp->w_width - off + win_col_off2(wp); + colnr_T off; + colnr_T col; + int width; + linenr_T lnum = pos->lnum; +#ifdef FEAT_FOLDING + int is_folded; - // long line wrapping, adjust row - if (wp->w_p_wrap - && col >= (colnr_T)wp->w_width - && width > 0) - { - // use same formula as what is used in curs_columns() - rowoff = ((col - wp->w_width) / width + 1); - col -= rowoff * width; - } - col -= wp->w_leftcol; - if (col >= wp->w_width) - col = -1; - if (col >= 0 && row + rowoff <= wp->w_height) + is_folded = hasFoldingWin(wp, lnum, &lnum, NULL, TRUE, NULL); +#endif + row = plines_m_win(wp, wp->w_topline, lnum - 1) + 1; +#ifdef FEAT_FOLDING + if (is_folded) { - coloff = col - scol + wp->w_wincol + 1; row += W_WINROW(wp); + coloff = wp->w_wincol + 1; } else - // character is left, right or below of the window - row = rowoff = scol = ccol = ecol = 0; +#endif + { + getvcol(wp, pos, &scol, &ccol, &ecol); + + // similar to what is done in validate_cursor_col() + col = scol; + off = win_col_off(wp); + col += off; + width = wp->w_width - off + win_col_off2(wp); + + // long line wrapping, adjust row + if (wp->w_p_wrap + && col >= (colnr_T)wp->w_width + && width > 0) + { + // use same formula as what is used in curs_columns() + rowoff = ((col - wp->w_width) / width + 1); + col -= rowoff * width; + } + col -= wp->w_leftcol; + if (col >= wp->w_width) + col = -1; + if (col >= 0 && row + rowoff <= wp->w_height) + { + coloff = col - scol + wp->w_wincol + 1; + row += W_WINROW(wp); + } + else + // character is left, right or below of the window + row = rowoff = scol = ccol = ecol = 0; + } } *rowp = row + rowoff; *scolp = scol + coloff; |