Mercurial > vim
changeset 33536:886e7c8f7614 v9.0.2017
patch 9.0.2017: linebreak applies for leading whitespace
Commit: https://github.com/vim/vim/commit/dd75fcfbdff1934c6e531b5a89ebc636318bf4a2
Author: Christian Brabandt <cb@256bit.org>
Date: Wed Oct 11 21:51:19 2023 +0200
patch 9.0.2017: linebreak applies for leading whitespace
Problem: linebreak applies for leading whitespace
Solution: only apply linebreak, once we have found non-breakat chars in
the line
closes: #13228
closes: #13243
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 11 Oct 2023 22:00:05 +0200 |
| parents | ac78267a29de |
| children | 26e2c7ba4943 |
| files | src/charset.c src/drawline.c src/testdir/test_listlbr.vim src/version.c |
| diffstat | 4 files changed, 49 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/charset.c +++ b/src/charset.c @@ -1123,6 +1123,7 @@ win_lbr_chartabsize( int n; char_u *sbr; int no_sbr = FALSE; + colnr_T vcol_start = 0; // start from where to consider linebreak #endif #if defined(FEAT_PROP_POPUP) @@ -1344,7 +1345,14 @@ win_lbr_chartabsize( * 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 != 0) + { + char_u *t = cts->cts_line; + while (VIM_ISBREAK((int)*t)) + t++; + vcol_start = t - cts->cts_line; + } + if (wp->w_p_lbr && vcol_start <= vcol && VIM_ISBREAK((int)s[0]) && !VIM_ISBREAK((int)s[1]) && wp->w_p_wrap
--- a/src/drawline.c +++ b/src/drawline.c @@ -171,6 +171,11 @@ typedef struct { #ifdef FEAT_SIGNS sign_attrs_T sattr; #endif +#ifdef FEAT_LINEBREAK + // do consider wrapping in linebreak mode only after encountering + // a non whitespace char + int need_lbr; +#endif } winlinevars_T; // draw_state values for items that are drawn in sequence: @@ -968,6 +973,9 @@ win_line_start(win_T *wp UNUSED, winline { wlv->col = 0; wlv->off = (unsigned)(current_ScreenLine - ScreenLines); +#ifdef FEAT_LINEBREAK + wlv->need_lbr = FALSE; +#endif #ifdef FEAT_RIGHTLEFT if (wp->w_p_rl) @@ -994,6 +1002,9 @@ win_line_start(win_T *wp UNUSED, winline wlv->saved_extra_for_textprop = wlv->extra_for_textprop; wlv->saved_c_extra = wlv->c_extra; wlv->saved_c_final = wlv->c_final; +#ifdef FEAT_LINEBREAK + wlv->need_lbr = TRUE; +#endif #ifdef FEAT_SYN_HL if (!(wlv->cul_screenline # ifdef FEAT_DIFF @@ -2905,8 +2916,19 @@ win_line( } #endif #ifdef FEAT_LINEBREAK + // 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((int)*ptr)) + wlv.need_lbr = TRUE; +#endif +#ifdef FEAT_LINEBREAK // Found last space before word: check for line break. - if (wp->w_p_lbr && c0 == c + if (wp->w_p_lbr && c0 == c && wlv.need_lbr && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) { int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1)
--- a/src/testdir/test_listlbr.vim +++ b/src/testdir/test_listlbr.vim @@ -372,4 +372,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