diff options
| -rw-r--r-- | src/nvim/drawline.c | 8 | ||||
| -rw-r--r-- | src/nvim/plines.c | 23 | ||||
| -rw-r--r-- | test/old/testdir/test_display.vim | 11 |
3 files changed, 19 insertions, 23 deletions
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index 7e92128b65..4b989fa59a 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -2291,14 +2291,6 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool number_onl wlv.n_extra = win_lbr_chartabsize(&cts, NULL) - 1; clear_chartabsize_arg(&cts); - // We have just drawn the showbreak value, no need to add - // space for it again. - if (wlv.vcol == wlv.vcol_sbr) { - wlv.n_extra -= mb_charlen(get_showbreak_value(wp)); - if (wlv.n_extra < 0) { - wlv.n_extra = 0; - } - } if (on_last_col && c != TAB) { // Do not continue search/match highlighting over the // line break, but for TABs the highlighting should diff --git a/src/nvim/plines.c b/src/nvim/plines.c index b95adc1415..e18e774a72 100644 --- a/src/nvim/plines.c +++ b/src/nvim/plines.c @@ -311,6 +311,9 @@ int win_lbr_chartabsize(chartabsize_T *cts, int *headp) int col_off_prev = win_col_off(wp); int width2 = wp->w_width_inner - col_off_prev + win_col_off2(wp); colnr_T wcol = vcol + col_off_prev; + colnr_T max_head_vcol = cts->cts_max_head_vcol; + int added = 0; + // cells taken by 'showbreak'/'breakindent' before current char int head_prev = 0; if (wcol >= wp->w_width_inner) { @@ -326,23 +329,17 @@ int win_lbr_chartabsize(chartabsize_T *cts, int *headp) head_prev += get_breakindent_win(wp, line); } if (wcol < head_prev) { - wcol = head_prev; - } - wcol += col_off_prev; - } - - if ((vcol > 0 && wcol == col_off_prev + head_prev) - || wcol + size > wp->w_width_inner) { - int added = 0; - colnr_T max_head_vcol = cts->cts_max_head_vcol; - - if (vcol > 0 && wcol == col_off_prev + head_prev) { + head_prev -= wcol; + wcol += head_prev; added += head_prev; if (max_head_vcol <= 0 || vcol < max_head_vcol) { head += head_prev; } } + wcol += col_off_prev; + } + if (wcol + size > wp->w_width) { // cells taken by 'showbreak'/'breakindent' halfway current char int head_mid = 0; if (*sbr != NUL) { @@ -379,9 +376,9 @@ int win_lbr_chartabsize(chartabsize_T *cts, int *headp) } } } - - size += added; } + + size += added; } if (headp != NULL) { diff --git a/test/old/testdir/test_display.vim b/test/old/testdir/test_display.vim index b08d093a2a..a0bbf34df2 100644 --- a/test/old/testdir/test_display.vim +++ b/test/old/testdir/test_display.vim @@ -420,12 +420,19 @@ func Test_display_linebreak_breakat() new vert resize 25 let _breakat = &breakat - setl signcolumn=yes linebreak breakat=) showbreak=+\ + setl signcolumn=yes linebreak breakat=) showbreak=++ call setline(1, repeat('x', winwidth(0) - 2) .. ')abc') let lines = ScreenLines([1, 2], 25) let expected = [ \ ' xxxxxxxxxxxxxxxxxxxxxxx', - \ ' + )abc ' + \ ' ++)abc ', + \ ] + call assert_equal(expected, lines) + setl breakindent breakindentopt=shift:2 + let lines = ScreenLines([1, 2], 25) + let expected = [ + \ ' xxxxxxxxxxxxxxxxxxxxxxx', + \ ' ++)abc ', \ ] call assert_equal(expected, lines) %bw! |