mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 19:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.1678: errorformat "%r" implies "%>"

Browse Source 
Problem:    Errorformat "%r" implies "%>". (Jan Gosmann)
Solution:   Jump to before setting fmt_ptr. (Yegappan Lakshmanan)

e333e79f9b
This commit is contained in:
Marco Hinz
2019-04-05 10:57:57 +02:00
parent 98a8187764
commit ced3598a96
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/quickfix.c
View File

@@ -730,6 +730,7 @@ static int qf_parse_line(qf_info_T *qi, int qf_idx, char_u *linebuf,
// Always ignore case when looking for a matching error. // Always ignore case when looking for a matching error.
regmatch.rm_ic = true; regmatch.rm_ic = true;
restofline:
// If there was no %> item start at the first pattern // If there was no %> item start at the first pattern
if (fmt_start == NULL) { if (fmt_start == NULL) {
fmt_ptr = fmt_first; fmt_ptr = fmt_first;
@@ -741,7 +742,6 @@ static int qf_parse_line(qf_info_T *qi, int qf_idx, char_u *linebuf,
// Try to match each part of 'errorformat' until we find a complete // Try to match each part of 'errorformat' until we find a complete
// match or no match. // match or no match.
fields->valid = true; fields->valid = true;
restofline:
for (; fmt_ptr != NULL; fmt_ptr = fmt_ptr->next) { for (; fmt_ptr != NULL; fmt_ptr = fmt_ptr->next) {
idx = fmt_ptr->prefix; idx = fmt_ptr->prefix;
if (qfl->qf_multiscan && vim_strchr((char_u *)"OPQ", idx) == NULL) { if (qfl->qf_multiscan && vim_strchr((char_u *)"OPQ", idx) == NULL) {

23
src/nvim/testdir/test_quickfix.vim
View File

@@ -2558,6 +2558,29 @@ func Xmultifilestack_tests(cchar)
call assert_equal(3, l1.items[1].lnum) call assert_equal(3, l1.items[1].lnum)
call assert_equal('two.txt', bufname(l2.items[1].bufnr)) call assert_equal('two.txt', bufname(l2.items[1].bufnr))
call assert_equal(5, l2.items[1].lnum) 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 endfunc
func Test_multifilestack() func Test_multifilestack()