Mercurial > vim
changeset 25322:b3d7becabe99 v8.2.3198
patch 8.2.3198: cannot use 'formatlistpat' for breakindent
Commit: https://github.com/vim/vim/commit/f674b358fc18cf1641a066cc5de73da69e651024
Author: Maxim Kim <habamax@gmail.com>
Date: Thu Jul 22 11:46:59 2021 +0200
patch 8.2.3198: cannot use 'formatlistpat' for breakindent
Problem: Cannot use 'formatlistpat' for breakindent.
Solution: Use a negative list indent. (Maxim Kim, closes https://github.com/vim/vim/issues/8594)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 22 Jul 2021 12:00:05 +0200 |
| parents | e99639cf8f64 |
| children | 605f57b8433c |
| files | runtime/doc/options.txt src/indent.c src/testdir/test_breakindent.vim src/version.c |
| diffstat | 4 files changed, 71 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1326,9 +1326,11 @@ A jump table for the options with a shor continuation (positive). sbr Display the 'showbreak' value before applying the additional indent. - list:{n} Adds an additional indent for lines that match a + list:{n} Adds an additional indent for lines that match a numbered or bulleted list (using the 'formatlistpat' setting). + list:-1 Uses the length of a match with 'formatlistpat' + for indentation. The default value for min is 20, shift and list is 0. *'browsedir'* *'bsdir'*
--- a/src/indent.c +++ b/src/indent.c @@ -941,15 +941,11 @@ get_breakindent_win( } bri = prev_indent + wp->w_briopt_shift; - // indent minus the length of the showbreak string - if (wp->w_briopt_sbr) - bri -= vim_strsize(get_showbreak_value(wp)); - // Add offset for number column, if 'n' is in 'cpoptions' bri += win_col_off2(wp); // add additional indent for numbered lists - if (wp->w_briopt_list > 0) + if (wp->w_briopt_list != 0) { regmatch_T regmatch; @@ -958,11 +954,21 @@ get_breakindent_win( if (regmatch.regprog != NULL) { if (vim_regexec(®match, line, 0)) - bri += wp->w_briopt_list; + { + if (wp->w_briopt_list > 0) + bri += wp->w_briopt_list; + else + bri = (*regmatch.endp - *regmatch.startp); + } vim_regfree(regmatch.regprog); } } + // indent minus the length of the showbreak string + if (wp->w_briopt_sbr) + bri -= vim_strsize(get_showbreak_value(wp)); + + // never indent past left window margin if (bri < 0) bri = 0;
--- a/src/testdir/test_breakindent.vim +++ b/src/testdir/test_breakindent.vim @@ -759,6 +759,7 @@ func Test_breakindent20_list() \ ] let lines = s:screen_lines2(1, 9, 20) call s:compare_lines(expect, lines) + " reset linebreak option " Note: it indents by one additional " space, because of the leading space. @@ -775,7 +776,59 @@ func Test_breakindent20_list() let lines = s:screen_lines2(1, 6, 20) call s:compare_lines(expect, lines) - call s:close_windows('set breakindent& briopt& linebreak& list& listchars&') + " check formatlistpat indent + setl briopt=min:5,list:-1 + setl linebreak list&vim listchars&vim + let &l:flp = '^\s*\d\+\.\?[\]:)}\t ]\s*' + redraw! + let expect = [ + \ " 1. Congress ", + \ " shall make no ", + \ " law ", + \ " 2.) Congress ", + \ " shall make no ", + \ " law ", + \ " 3.] Congress ", + \ " shall make no ", + \ " law ", + \ ] + let lines = s:screen_lines2(1, 9, 20) + call s:compare_lines(expect, lines) + " check formatlistpat indent with different list levels + let &l:flp = '^\s*\*\+\s\+' + redraw! + %delete _ + call setline(1, ['* Congress shall make no law', + \ '*** Congress shall make no law', + \ '**** Congress shall make no law']) + norm! 1gg + let expect = [ + \ "* Congress shall ", + \ " make no law ", + \ "*** Congress shall ", + \ " make no law ", + \ "**** Congress shall ", + \ " make no law ", + \ ] + let lines = s:screen_lines2(1, 6, 20) + call s:compare_lines(expect, lines) + + " check formatlistpat indent with different list level + " showbreak and sbr + setl briopt=min:5,sbr,list:-1,shift:2 + setl showbreak=> + redraw! + let expect = [ + \ "* Congress shall ", + \ "> make no law ", + \ "*** Congress shall ", + \ "> make no law ", + \ "**** Congress shall ", + \ "> make no law ", + \ ] + let lines = s:screen_lines2(1, 6, 20) + call s:compare_lines(expect, lines) + call s:close_windows('set breakindent& briopt& linebreak& list& listchars& showbreak&') endfunc " vim: shiftwidth=2 sts=2 expandtab