Mercurial > vim
changeset 30041:1100c9c3fd2a v9.0.0358
patch 9.0.0358: 'breakindent' does not indent non-lists
Commit: https://github.com/vim/vim/commit/119167265ebc7eced210a7f8ed2f4b90378f98f1
Author: Maxim Kim <habamax@gmail.com>
Date: Fri Sep 2 14:08:53 2022 +0100
patch 9.0.0358: 'breakindent' does not indent non-lists
Problem: 'breakindent' does not indent non-lists with
"breakindentopt=list:-1".
Solution: Adjust indent computation. (Maxim Kim, closes #11038)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 02 Sep 2022 15:15:03 +0200 |
| parents | d5a6eb942188 |
| children | 24d37e312b7b |
| files | src/indent.c src/testdir/test_breakindent.vim src/version.c |
| diffstat | 3 files changed, 44 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/indent.c +++ b/src/indent.c @@ -998,7 +998,7 @@ get_breakindent_win( if (wp->w_briopt_list > 0) prev_list = wp->w_briopt_list; else - prev_list = (*regmatch.endp - *regmatch.startp); + prev_indent = (*regmatch.endp - *regmatch.startp); } vim_regfree(regmatch.regprog); } @@ -1017,13 +1017,8 @@ get_breakindent_win( bri += win_col_off2(wp); // add additional indent for numbered lists - if (wp->w_briopt_list != 0) - { - if (wp->w_briopt_list > 0) - bri += prev_list; - else - bri = prev_list; - } + if (wp->w_briopt_list > 0) + bri += prev_list; // indent minus the length of the showbreak string if (wp->w_briopt_sbr)
--- a/src/testdir/test_breakindent.vim +++ b/src/testdir/test_breakindent.vim @@ -818,7 +818,7 @@ func Test_breakindent20_list() " check formatlistpat indent with different list level " showbreak and sbr - setl briopt=min:5,sbr,list:-1,shift:2 + setl briopt=min:5,sbr,list:-1 setl showbreak=> redraw! let expect = [ @@ -831,6 +831,44 @@ func Test_breakindent20_list() \ ] let lines = s:screen_lines2(1, 6, 20) call s:compare_lines(expect, lines) + + " check formatlistpat indent with different list level + " showbreak sbr and shift + 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) + + " check breakindent works if breakindentopt=list:-1 + " for a non list content + %delete _ + call setline(1, [' Congress shall make no law', + \ ' Congress shall make no law', + \ ' Congress shall make no law']) + norm! 1gg + setl briopt=min:5,list:-1 + 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