Mercurial > vim
changeset 14491:9df0fcbfebb2 v8.1.0259
patch 8.1.0259: no test for fixed quickfix issue
commit https://github.com/vim/vim/commit/3f347e4716c44cf6458be407e712e3d708d82580
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Aug 9 21:19:20 2018 +0200
patch 8.1.0259: no test for fixed quickfix issue
Problem: No test for fixed quickfix issue.
Solution: Add a test. Clean up the code a bit. (Yegappan Lakshmanan)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 09 Aug 2018 21:30:05 +0200 |
| parents | 139e631d523f |
| children | 606fda16278d |
| files | src/quickfix.c src/testdir/test_quickfix.vim src/version.c |
| diffstat | 3 files changed, 29 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/quickfix.c +++ b/src/quickfix.c @@ -1506,7 +1506,6 @@ qf_list_empty(qf_info_T *qi, int qf_idx) return qi->qf_lists[qf_idx].qf_count <= 0; } - /* * Allocate the fields used for parsing lines and populating a quickfix list. */ @@ -3717,7 +3716,7 @@ qf_view_result(int split) if (IS_LL_WINDOW(curwin)) qi = GET_LOC_LIST(curwin); - if (qi == NULL || qi->qf_lists[qi->qf_curlist].qf_count == 0) + if (qf_list_empty(qi, qi->qf_curlist)) { EMSG(_(e_quickfix)); return; @@ -4349,7 +4348,8 @@ qf_jump_first(qf_info_T *qi, int_u save_ if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid) qi->qf_curlist = qf_id2nr(qi, save_qfid); - if (qi->qf_lists[qi->qf_curlist].qf_count > 0) + // Autocommands might have cleared the list, check for it + if (!qf_list_empty(qi, qi->qf_curlist)) qf_jump(qi, 0, 0, forceit); } @@ -4873,10 +4873,8 @@ ex_cfile(exarg_T *eap) // free the list. if (res > 0 && (eap->cmdidx == CMD_cfile || eap->cmdidx == CMD_lfile) && qflist_valid(wp, save_qfid)) - { // display the first error qf_jump_first(qi, save_qfid, eap->forceit); - } } /* @@ -6581,10 +6579,8 @@ ex_cbuffer(exarg_T *eap) if (res > 0 && (eap->cmdidx == CMD_cbuffer || eap->cmdidx == CMD_lbuffer) && qflist_valid(wp, save_qfid)) - { // display the first error qf_jump_first(qi, save_qfid, eap->forceit); - } } } } @@ -6661,10 +6657,8 @@ ex_cexpr(exarg_T *eap) if (res > 0 && (eap->cmdidx == CMD_cexpr || eap->cmdidx == CMD_lexpr) && qflist_valid(wp, save_qfid)) - { // display the first error qf_jump_first(qi, save_qfid, eap->forceit); - } } else EMSG(_("E777: String or List expected"));
--- a/src/testdir/test_quickfix.vim +++ b/src/testdir/test_quickfix.vim @@ -3478,6 +3478,30 @@ func Xautocmd_changelist(cchar) call assert_equal(5, line('.')) autocmd! QuickFixCmdPost + " Test for autocommands clearing the quickfix list before jumping to the + " first error. This should not result in an error + autocmd QuickFixCmdPost * call g:Xsetlist([], 'r') + let v:errmsg = '' + " Test for cfile/lfile + Xfile Xerr + call assert_true(v:errmsg !~# 'E42:') + " Test for cbuffer/lbuffer + edit Xerr + Xbuffer + call assert_true(v:errmsg !~# 'E42:') + " Test for cexpr/lexpr + Xexpr 'Xtestfile2:4:Line4' + call assert_true(v:errmsg !~# 'E42:') + " Test for grep/lgrep + " The grepprg may not be set on non-Unix systems + if has('unix') + silent Xgrep Line5 Xtestfile2 + call assert_true(v:errmsg !~# 'E42:') + endif + " Test for vimgrep/lvimgrep + call assert_fails('silent Xvimgrep Line5 Xtestfile2', 'E480:') + autocmd! QuickFixCmdPost + call delete('Xerr') call delete('Xtestfile1') call delete('Xtestfile2')