mirror of
https://github.com/neovim/neovim.git
synced 2025-09-06 11:28:22 +00:00
vim-patch:8.0.0026
Problem: Error format with %W, %C and %Z does not work. (Gerd Wachsmuth)
Solution: Skip code when qf_multiignore is set. (Lcd)
9b45794818
This commit is contained in:
@@ -875,6 +875,7 @@ restofline:
|
|||||||
qi->qf_multiignore = false; // reset continuation
|
qi->qf_multiignore = false; // reset continuation
|
||||||
} else if (vim_strchr((char_u *)"CZ", idx)
|
} else if (vim_strchr((char_u *)"CZ", idx)
|
||||||
!= NULL) { // continuation of multi-line msg
|
!= NULL) { // continuation of multi-line msg
|
||||||
|
if (!qi->qf_multiignore) {
|
||||||
qfline_T *qfprev = qi->qf_lists[qi->qf_curlist].qf_last;
|
qfline_T *qfprev = qi->qf_lists[qi->qf_curlist].qf_last;
|
||||||
if (qfprev == NULL) {
|
if (qfprev == NULL) {
|
||||||
return QF_FAIL;
|
return QF_FAIL;
|
||||||
@@ -906,6 +907,7 @@ restofline:
|
|||||||
: qi->qf_currfile && fields->valid
|
: qi->qf_currfile && fields->valid
|
||||||
? qi->qf_currfile : 0);
|
? qi->qf_currfile : 0);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (idx == 'Z') {
|
if (idx == 'Z') {
|
||||||
qi->qf_multiline = qi->qf_multiignore = false;
|
qi->qf_multiline = qi->qf_multiignore = false;
|
||||||
}
|
}
|
||||||
|
@@ -816,6 +816,29 @@ function! Test_efm_dirstack()
|
|||||||
call delete('habits1.txt')
|
call delete('habits1.txt')
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
" Test for resync after continuing an ignored message
|
||||||
|
function! Xefm_ignore_continuations(cchar)
|
||||||
|
call s:setup_commands(a:cchar)
|
||||||
|
|
||||||
|
let save_efm = &efm
|
||||||
|
|
||||||
|
let &efm =
|
||||||
|
\ '%Eerror %m %l,' .
|
||||||
|
\ '%-Wignored %m %l,' .
|
||||||
|
\ '%+Cmore ignored %m %l,' .
|
||||||
|
\ '%Zignored end'
|
||||||
|
Xgetexpr ['ignored warning 1', 'more ignored continuation 2', 'ignored end', 'error resync 4']
|
||||||
|
let l = map(g:Xgetlist(), '[v:val.text, v:val.valid, v:val.lnum, v:val.type]')
|
||||||
|
call assert_equal([['resync', 1, 4, 'E']], l)
|
||||||
|
|
||||||
|
let &efm = save_efm
|
||||||
|
endfunction
|
||||||
|
|
||||||
|
function! Test_efm_ignore_continuations()
|
||||||
|
call Xefm_ignore_continuations('c')
|
||||||
|
call Xefm_ignore_continuations('l')
|
||||||
|
endfunction
|
||||||
|
|
||||||
" Tests for invalid error format specifies
|
" Tests for invalid error format specifies
|
||||||
function Xinvalid_efm_Tests(cchar)
|
function Xinvalid_efm_Tests(cchar)
|
||||||
call s:setup_commands(a:cchar)
|
call s:setup_commands(a:cchar)
|
||||||
|
@@ -703,7 +703,7 @@ static const int included_patches[] = {
|
|||||||
// 29 NA
|
// 29 NA
|
||||||
// 28 NA
|
// 28 NA
|
||||||
// 27 NA
|
// 27 NA
|
||||||
// 26,
|
26,
|
||||||
// 25,
|
// 25,
|
||||||
// 24 NA
|
// 24 NA
|
||||||
// 23,
|
// 23,
|
||||||
|
Reference in New Issue
Block a user