Mercurial > vim
changeset 13612:89223f5d5d12 v8.0.1678
patch 8.0.1678: errorformat "%r" implies "%>"
commit https://github.com/vim/vim/commit/e333e79f9bdff82432e0fd7fcf7ae30ef8e3d092
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Apr 8 13:27:39 2018 +0200
patch 8.0.1678: errorformat "%r" implies "%>"
Problem: Errorformat "%r" implies "%>". (Jan Gosmann)
Solution: Jump to before setting fmt_ptr. (Yegappan Lakshmanan,
closes #2785)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 08 Apr 2018 13:30:06 +0200 |
| parents | 60f7b362f2cf |
| children | 90511e74baf5 |
| files | src/quickfix.c src/testdir/test_quickfix.vim src/version.c |
| diffstat | 3 files changed, 26 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/quickfix.c +++ b/src/quickfix.c @@ -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; @@ -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;
--- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -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()