diff options
| -rw-r--r-- | src/nvim/drawline.c | 19 | ||||
| -rw-r--r-- | src/nvim/plines.c | 10 | ||||
| -rw-r--r-- | test/old/testdir/test_listlbr.vim | 15 |
3 files changed, 41 insertions, 3 deletions
diff --git a/src/nvim/drawline.c b/src/nvim/drawline.c index 2d450087fd..1c7f649848 100644 --- a/src/nvim/drawline.c +++ b/src/nvim/drawline.c @@ -127,6 +127,9 @@ typedef struct { int filler_lines; ///< nr of filler lines to be drawn int filler_todo; ///< nr of filler lines still to do + 1 SignTextAttrs sattrs[SIGN_SHOW_MAX]; ///< sign attributes for the sign column + /// do consider wrapping in linebreak mode only after encountering + /// a non whitespace char + bool need_lbr; VirtText virt_inline; size_t virt_inline_i; @@ -1018,6 +1021,7 @@ static void win_line_start(win_T *wp, winlinevars_T *wlv, bool save_extra) { wlv->col = 0; wlv->off = 0; + wlv->need_lbr = false; if (wp->w_p_rl) { // Rightleft window: process the text in the normal direction, but put @@ -1038,6 +1042,7 @@ static void win_line_start(win_T *wp, winlinevars_T *wlv, bool save_extra) wlv->saved_extra_for_extmark = wlv->extra_for_extmark; wlv->saved_c_extra = wlv->c_extra; wlv->saved_c_final = wlv->c_final; + wlv->need_lbr = true; wlv->saved_char_attr = wlv->char_attr; wlv->n_extra = 0; @@ -2302,9 +2307,19 @@ int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow, bool number_onl wlv.char_attr = hl_combine_attr(term_attrs[wlv.vcol], wlv.char_attr); } + // we don't want linebreak to apply for lines that start with + // leading spaces, followed by long letters (since it would add + // a break at the beginning of a line and this might be unexpected) + // + // So only allow to linebreak, once we have found chars not in + // 'breakat' in the line. + if (wp->w_p_lbr && !wlv.need_lbr && c != NUL + && !vim_isbreak((uint8_t)(*ptr))) { + wlv.need_lbr = true; + } // Found last space before word: check for line break. - if (wp->w_p_lbr && c0 == c && vim_isbreak(c) - && !vim_isbreak((int)(*ptr))) { + if (wp->w_p_lbr && c0 == c && wlv.need_lbr + && vim_isbreak(c) && !vim_isbreak((uint8_t)(*ptr))) { int mb_off = utf_head_off(line, ptr - 1); char *p = ptr - (mb_off + 1); chartabsize_T cts; diff --git a/src/nvim/plines.c b/src/nvim/plines.c index 97782b39bc..2b8cdd4ad9 100644 --- a/src/nvim/plines.c +++ b/src/nvim/plines.c @@ -340,9 +340,17 @@ int win_lbr_chartabsize(chartabsize_T *cts, int *headp) *headp = head; } + colnr_T vcol_start = 0; // start from where to consider linebreak // If 'linebreak' set check at a blank before a non-blank if the line // needs a break here - if (wp->w_p_lbr + if (wp->w_p_lbr && wp->w_p_wrap && wp->w_width_inner != 0) { + char *t = cts->cts_line; + while (vim_isbreak((uint8_t)(*t))) { + t++; + } + vcol_start = (colnr_T)(t - cts->cts_line); + } + if (wp->w_p_lbr && vcol_start <= vcol && vim_isbreak((uint8_t)s[0]) && !vim_isbreak((uint8_t)s[1]) && wp->w_p_wrap diff --git a/test/old/testdir/test_listlbr.vim b/test/old/testdir/test_listlbr.vim index 9b9bf63864..6dea94fbf1 100644 --- a/test/old/testdir/test_listlbr.vim +++ b/test/old/testdir/test_listlbr.vim @@ -373,4 +373,19 @@ func Test_ctrl_char_on_wrap_column() call s:close_windows() endfunc +func Test_linebreak_no_break_after_whitespace_only() + call s:test_windows('setl ts=4 linebreak wrap') + call setline(1, "\tabcdefghijklmnopqrstuvwxyz" .. + \ "abcdefghijklmnopqrstuvwxyz") + let lines = s:screen_lines([1, 4], winwidth(0)) + let expect = [ +\ " abcdefghijklmnop", +\ "qrstuvwxyzabcdefghij", +\ "klmnopqrstuvwxyz ", +\ "~ ", +\ ] + call s:compare_lines(expect, lines) + call s:close_windows() +endfunc + " vim: shiftwidth=2 sts=2 expandtab |