diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-10-06 19:21:20 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-10-06 19:21:20 +0100 |
| commit | 06618f94f1c9ed73a84ad5d6a8e1933b0b8da846 (patch) | |
| tree | 148d12a8da52cc6e477a2216e7fb884076034631 /src | |
| parent | d459020c62f945ca089a6f7349d559cc9db8596b (diff) | |
patch 9.0.0677: breakindent test accepts wrong resultv9.0.0677
Problem: Breakindent test accepts wrong result.
Solution: Fix the number column and adjust the expected text.
Diffstat (limited to 'src')
| -rw-r--r-- | src/drawline.c | 7 | ||||
| -rw-r--r-- | src/testdir/test_breakindent.vim | 28 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 18 insertions, 19 deletions
diff --git a/src/drawline.c b/src/drawline.c index 018a6d8c5f..4bda102bae 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -343,9 +343,8 @@ handle_lnum_col( int num_attr UNUSED) { if ((wp->w_p_nu || wp->w_p_rnu) - && ((wlv->row == wlv->startrow + wlv->filler_lines - && (wp->w_skipcol == 0 || wlv->row > wp->w_winrow)) - || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) + && (wlv->row == wlv->startrow + wlv->filler_lines + || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) { #ifdef FEAT_SIGNS // If 'signcolumn' is set to 'number' and a sign is present @@ -363,7 +362,7 @@ handle_lnum_col( #ifdef FEAT_PROP_POPUP + wlv->text_prop_above_count #endif - ) + && (wp->w_skipcol == 0 || wlv->row > wp->w_winrow)) { long num; char *fmt = "%*ld "; diff --git a/src/testdir/test_breakindent.vim b/src/testdir/test_breakindent.vim index 3b606076a6..289dc08bf3 100644 --- a/src/testdir/test_breakindent.vim +++ b/src/testdir/test_breakindent.vim @@ -671,14 +671,14 @@ endfunc func Test_breakindent20_cpo_n_nextpage() let s:input = "" call s:test_windows('setl breakindent briopt=min:14 cpo+=n number') - call setline(1, repeat('a', 200)) + call setline(1, repeat('abcdefghijklmnopqrst', 10)) norm! 1gg redraw! let lines = s:screen_lines(1, 20) let expect = [ - \ " 1 aaaaaaaaaaaaaaaa", - \ " aaaaaaaaaaaaaaaa", - \ " aaaaaaaaaaaaaaaa", + \ " 1 abcdefghijklmnop", + \ " qrstabcdefghijkl", + \ " mnopqrstabcdefgh", \ ] call s:compare_lines(expect, lines) " Scroll down one screen line @@ -686,11 +686,10 @@ func Test_breakindent20_cpo_n_nextpage() norm! 5gj redraw! let lines = s:screen_lines(1, 20) - " FIXME: this is not the right result let expect = [ - \ "<<<aaaaaaaaaaaaaaaaa", - \ " aaaaaaaaaaaaaaaa", - \ " aaaaaaaaaaaaaaaa", + \ "<<< qrstabcdefghijkl", + \ " mnopqrstabcdefgh", + \ " ijklmnopqrstabcd", \ ] call s:compare_lines(expect, lines) @@ -698,19 +697,18 @@ func Test_breakindent20_cpo_n_nextpage() norm! 1gg let lines = s:screen_lines(1, 20) let expect = [ - \ " 1 aaaaaaaaaaaaaaaa", - \ " aaaaaaaaaaaaaa", - \ " aaaaaaaaaaaaaa", + \ " 1 abcdefghijklmnop", + \ " qrstabcdefghij", + \ " klmnopqrstabcd", \ ] call s:compare_lines(expect, lines) " Scroll down one screen line norm! 5gj let lines = s:screen_lines(1, 20) - " FIXME: this is not the right result let expect = [ - \ "<<<aaaaaaaaaaaaaaaaa", - \ " aaaaaaaaaaaaaa", - \ " aaaaaaaaaaaaaa", + \ "<<< qrstabcdefghij", + \ " klmnopqrstabcd", + \ " efghijklmnopqr", \ ] call s:compare_lines(expect, lines) diff --git a/src/version.c b/src/version.c index 5cf086ec9b..6cbce975f2 100644 --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 677, +/**/ 676, /**/ 675, |