mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
patch 8.0.1029: return value of getqflist() is inconsistent
Problem: Return value of getqflist() is inconsistent. (Lcd47) Solution: Always return an "items" entry.
This commit is contained in:
@@ -4653,6 +4653,11 @@ qf_get_list_from_text(dictitem_T *di, dict_T *retdict)
|
|||||||
|| (di->di_tv.v_type == VAR_LIST
|
|| (di->di_tv.v_type == VAR_LIST
|
||||||
&& di->di_tv.vval.v_list != NULL))
|
&& di->di_tv.vval.v_list != NULL))
|
||||||
{
|
{
|
||||||
|
list_T *l = list_alloc();
|
||||||
|
|
||||||
|
if (l == NULL)
|
||||||
|
return FAIL;
|
||||||
|
|
||||||
qi = (qf_info_T *)alloc((unsigned)sizeof(qf_info_T));
|
qi = (qf_info_T *)alloc((unsigned)sizeof(qf_info_T));
|
||||||
if (qi != NULL)
|
if (qi != NULL)
|
||||||
{
|
{
|
||||||
@@ -4661,18 +4666,14 @@ qf_get_list_from_text(dictitem_T *di, dict_T *retdict)
|
|||||||
|
|
||||||
if (qf_init_ext(qi, 0, NULL, NULL, &di->di_tv, p_efm,
|
if (qf_init_ext(qi, 0, NULL, NULL, &di->di_tv, p_efm,
|
||||||
TRUE, (linenr_T)0, (linenr_T)0, NULL, NULL) > 0)
|
TRUE, (linenr_T)0, (linenr_T)0, NULL, NULL) > 0)
|
||||||
{
|
|
||||||
list_T *l = list_alloc();
|
|
||||||
if (l != NULL)
|
|
||||||
{
|
{
|
||||||
(void)get_errorlist(qi, NULL, 0, l);
|
(void)get_errorlist(qi, NULL, 0, l);
|
||||||
dict_add_list(retdict, "items", l);
|
|
||||||
status = OK;
|
|
||||||
}
|
|
||||||
qf_free(qi, 0);
|
qf_free(qi, 0);
|
||||||
}
|
}
|
||||||
free(qi);
|
free(qi);
|
||||||
}
|
}
|
||||||
|
dict_add_list(retdict, "items", l);
|
||||||
|
status = OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
|
@@ -2536,7 +2536,7 @@ func XgetListFromText(cchar)
|
|||||||
call assert_equal(30, l[1].lnum)
|
call assert_equal(30, l[1].lnum)
|
||||||
|
|
||||||
call assert_equal({}, g:Xgetlist({'text' : 10}))
|
call assert_equal({}, g:Xgetlist({'text' : 10}))
|
||||||
call assert_equal({}, g:Xgetlist({'text' : []}))
|
call assert_equal([], g:Xgetlist({'text' : []}).items)
|
||||||
|
|
||||||
" Make sure that the quickfix stack is not modified
|
" Make sure that the quickfix stack is not modified
|
||||||
call assert_equal(0, g:Xgetlist({'nr' : '$'}).nr)
|
call assert_equal(0, g:Xgetlist({'nr' : '$'}).nr)
|
||||||
|
@@ -769,6 +769,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1029,
|
||||||
/**/
|
/**/
|
||||||
1028,
|
1028,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user