thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.0358: 'breakindent' does not indent non-lists

Browse Source 
Problem:    'breakindent' does not indent non-lists with
            "breakindentopt=list:-1".
Solution:   Adjust indent computation. (Maxim Kim, closes #11038)
This commit is contained in:
Maxim Kim
2022-09-02 14:08:53 +01:00
committed by Bram Moolenaar
parent cf2bb63397
commit 119167265e
3 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/indent.c
View File

@@ -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;
}
// indent minus the length of the showbreak string
if (wp->w_briopt_sbr)

38
src/testdir/test_breakindent.vim
View File

@@ -818,6 +818,22 @@ func Test_breakindent20_list()
" check formatlistpat indent with different list level
" showbreak and sbr
setl briopt=min:5,sbr,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)
" check formatlistpat indent with different list level
" showbreak sbr and shift
setl briopt=min:5,sbr,list:-1,shift:2
setl showbreak=>
redraw!
@@ -831,6 +847,28 @@ func Test_breakindent20_list()
\ ]
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

2
src/version.c
View File

@@ -707,6 +707,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
358,
/**/
357,
/**/