thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.1072: screenpos() column result in fold may be too small

Browse Source 
Problem:    screenpos() column result in fold may be too small.
Solution:   Add space of 'number', sign column, etc. (closes #11715)
This commit is contained in:
zeertzjq
2022-12-18 12:28:59 +00:00
committed by Bram Moolenaar
parent b5328b46a7
commit ba2d191932
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/move.c
View File

@@ -1416,7 +1416,6 @@ textpos2screenpos(
if (pos->lnum >= wp->w_topline && pos->lnum <= wp->w_botline) if (pos->lnum >= wp->w_topline && pos->lnum <= wp->w_botline)
{ {
colnr_T off;
colnr_T col; colnr_T col;
int width; int width;
linenr_T lnum = pos->lnum; linenr_T lnum = pos->lnum;
@@ -1432,11 +1431,12 @@ textpos2screenpos(
row += diff_check_fill(wp, lnum); row += diff_check_fill(wp, lnum);
#endif #endif
colnr_T off = win_col_off(wp);
#ifdef FEAT_FOLDING #ifdef FEAT_FOLDING
if (is_folded) if (is_folded)
{ {
row += W_WINROW(wp); row += W_WINROW(wp);
coloff = wp->w_wincol + 1; coloff = wp->w_wincol + 1 + off;
} }
else else
#endif #endif
@@ -1445,7 +1445,6 @@ textpos2screenpos(
// similar to what is done in validate_cursor_col() // similar to what is done in validate_cursor_col()
col = scol; col = scol;
off = win_col_off(wp);
col += off; col += off;
width = wp->w_width - off + win_col_off2(wp); width = wp->w_width - off + win_col_off2(wp);

8
src/testdir/test_cursor_func.vim
View File

@@ -150,8 +150,12 @@ func Test_screenpos_fold()
redraw redraw
call assert_equal(2, screenpos(1, 2, 1).row) 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(#{col: 1, row: 3, endcol: 1, curscol: 1}, screenpos(1, 3, 1))
call assert_equal(3, screenpos(1, 4, 1).row) call assert_equal(#{col: 1, row: 3, endcol: 1, curscol: 1}, screenpos(1, 4, 1))
call assert_equal(3, screenpos(1, 5, 1).row) call assert_equal(#{col: 1, row: 3, endcol: 1, curscol: 1}, screenpos(1, 5, 1))
setlocal number
call assert_equal(#{col: 5, row: 3, endcol: 5, curscol: 5}, screenpos(1, 3, 1))
call assert_equal(#{col: 5, row: 3, endcol: 5, curscol: 5}, screenpos(1, 4, 1))
call assert_equal(#{col: 5, row: 3, endcol: 5, curscol: 5}, screenpos(1, 5, 1))
call assert_equal(4, screenpos(1, 6, 1).row) call assert_equal(4, screenpos(1, 6, 1).row)
bwipe! bwipe!
endfunc endfunc

2
src/version.c
View File

@@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1072,
/**/ /**/
1071, 1071,
/**/ /**/