Permalink
Browse files

patch 8.0.0687: minor issues related to quickfix

Problem:    Minor issues related to quickfix.
Solution:   Set the proper return status for all cases in setqflist() and at
            test cases for this.  Move the "adding" flag outside of
            FEAT_WINDOWS. Minor update to the setqflist() help text. (Yegappan
            Lakshmanan)
  • Loading branch information...
brammool committed Jun 28, 2017
1 parent 9f5f7bf commit 86f100dc0922e83bead7bcd5fd2bb2abbf153f46
Showing with 23 additions and 10 deletions.
  1. +2 −1 runtime/doc/eval.txt
  2. +13 −6 src/quickfix.c
  3. +6 −3 src/testdir/test_quickfix.vim
  4. +2 −0 src/version.c
View
@@ -7008,7 +7008,8 @@ setqflist({list} [, {action}[, {what}]]) *setqflist()*
title quickfix list title text
Unsupported keys in {what} are ignored.
If the "nr" item is not present, then the current quickfix list
is modified.
is modified. When creating a new quickfix list, "nr" can be
set to a value one greater than the quickfix stack size.
Examples: >
:call setqflist([], 'r', {'title': 'My search'})
View
@@ -1163,8 +1163,8 @@ qf_init_ext(
qffields_T fields;
#ifdef FEAT_WINDOWS
qfline_T *old_last = NULL;
int adding = FALSE;
#endif
int adding = FALSE;
static efm_T *fmt_first = NULL;
char_u *efm;
static char_u *last_efm = NULL;
@@ -1199,14 +1199,15 @@ qf_init_ext(
if (newlist || qi->qf_curlist == qi->qf_listcount)
/* make place for a new list */
qf_new_list(qi, qf_title);
#ifdef FEAT_WINDOWS
else if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
else
{
/* Adding to existing list, use last entry. */
adding = TRUE;
old_last = qi->qf_lists[qi->qf_curlist].qf_last;
}
#ifdef FEAT_WINDOWS
if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
old_last = qi->qf_lists[qi->qf_curlist].qf_last;
#endif
}
/* Use the local value of 'errorformat' if it's set. */
if (errorformat == p_efm && tv == NULL && *buf->b_p_efm != NUL)
@@ -4785,6 +4786,8 @@ get_errorlist_properties(win_T *wp, dict_T *what, dict_T *retdict)
(void)get_errorlist(wp, qf_idx, l);
dict_add_list(retdict, "items", l);
}
else
status = FAIL;
}
if ((status == OK) && (flags & QF_GETLIST_CONTEXT))
@@ -4795,9 +4798,12 @@ get_errorlist_properties(win_T *wp, dict_T *what, dict_T *retdict)
if (di != NULL)
{
copy_tv(qi->qf_lists[qf_idx].qf_ctx, &di->di_tv);
if (dict_add(retdict, di) == FAIL)
status = dict_add(retdict, di);
if (status == FAIL)
dictitem_free(di);
}
else
status = FAIL;
}
else
status = dict_add_nr_str(retdict, "context", 0L, (char_u *)"");
@@ -5020,6 +5026,7 @@ qf_set_properties(qf_info_T *qi, dict_T *what, int action)
if (ctx != NULL)
copy_tv(&di->di_tv, ctx);
qi->qf_lists[qf_idx].qf_ctx = ctx;
retval = OK;
}
return retval;
@@ -1720,7 +1720,8 @@ func Xproperty_tests(cchar)
Xopen
wincmd p
call g:Xsetlist([{'filename':'foo', 'lnum':27}])
call g:Xsetlist([], 'a', {'title' : 'Sample'})
let s = g:Xsetlist([], 'a', {'title' : 'Sample'})
call assert_equal(0, s)
let d = g:Xgetlist({"title":1})
call assert_equal('Sample', d.title)
@@ -1774,7 +1775,8 @@ func Xproperty_tests(cchar)
endif
" Context related tests
call g:Xsetlist([], 'a', {'context':[1,2,3]})
let s = g:Xsetlist([], 'a', {'context':[1,2,3]})
call assert_equal(0, s)
call test_garbagecollect_now()
let d = g:Xgetlist({'context':1})
call assert_equal([1,2,3], d.context)
@@ -1839,8 +1841,9 @@ func Xproperty_tests(cchar)
" Test for setting/getting items
Xexpr ""
let qfprev = g:Xgetlist({'nr':0})
call g:Xsetlist([], ' ', {'title':'Green',
let s = g:Xsetlist([], ' ', {'title':'Green',
\ 'items' : [{'filename':'F1', 'lnum':10}]})
call assert_equal(0, s)
let qfcur = g:Xgetlist({'nr':0})
call assert_true(qfcur.nr == qfprev.nr + 1)
let l = g:Xgetlist({'items':1})
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
687,
/**/
686,
/**/

0 comments on commit 86f100d

Please sign in to comment.