Skip to content

Commit

Permalink
patch 8.0.1678: errorformat "%r" implies "%>"
Browse files Browse the repository at this point in the history
Problem:    Errorformat "%r" implies "%>". (Jan Gosmann)
Solution:   Jump to before setting fmt_ptr. (Yegappan Lakshmanan,
            closes #2785)
  • Loading branch information
brammool committed Apr 8, 2018
1 parent ea39176 commit e333e79
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/quickfix.c
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,7 @@ qf_parse_line(
/* Always ignore case when looking for a matching error. */
regmatch.rm_ic = TRUE;

restofline:
/* If there was no %> item start at the first pattern */
if (fmt_start == NULL)
fmt_ptr = fmt_first;
Expand All @@ -858,7 +859,6 @@ qf_parse_line(
* match or no match.
*/
fields->valid = TRUE;
restofline:
for ( ; fmt_ptr != NULL; fmt_ptr = fmt_ptr->next)
{
int r;
Expand Down
23 changes: 23 additions & 0 deletions src/testdir/test_quickfix.vim
Original file line number Diff line number Diff line change
Expand Up @@ -2582,6 +2582,29 @@ func Xmultifilestack_tests(cchar)
call assert_equal(3, l1.items[1].lnum)
call assert_equal('two.txt', bufname(l2.items[1].bufnr))
call assert_equal(5, l2.items[1].lnum)

" Test for start of a new error line in the same line where a previous
" error line ends with a file stack.
let efm_val = 'Error\ l%l\ in\ %f,'
let efm_val .= '%-P%>(%f%r,Error\ l%l\ in\ %m,%-Q)%r'
let l = g:Xgetlist({'lines' : [
\ '(one.txt',
\ 'Error l4 in one.txt',
\ ') (two.txt',
\ 'Error l6 in two.txt',
\ ')',
\ 'Error l8 in one.txt'
\ ], 'efm' : efm_val})
call assert_equal(3, len(l.items))
call assert_equal('one.txt', bufname(l.items[0].bufnr))
call assert_equal(4, l.items[0].lnum)
call assert_equal('one.txt', l.items[0].text)
call assert_equal('two.txt', bufname(l.items[1].bufnr))
call assert_equal(6, l.items[1].lnum)
call assert_equal('two.txt', l.items[1].text)
call assert_equal('one.txt', bufname(l.items[2].bufnr))
call assert_equal(8, l.items[2].lnum)
call assert_equal('', l.items[2].text)
endfunc

func Test_multifilestack()
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1678,
/**/
1677,
/**/
Expand Down

0 comments on commit e333e79

Please sign in to comment.