IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.0.0687: minor issues related to quickfix

Browse Source 
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)
86f100dc09
This commit is contained in:
Jan Edmund Lazo 2018-07-28 10:22:19 -04:00
parent a2253744c9
commit 91b8210779
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
runtime/doc/eval.txt
View File

@ -6914,7 +6914,8 @@ setqflist({list} [, {action}[, {what}]]) *setqflist()*
title quickfix list title text title quickfix list title text
Unsupported keys in {what} are ignored. Unsupported keys in {what} are ignored.
If the "nr" item is not present, then the current quickfix list 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: > Examples: >
:call setqflist([], 'r', {'title': 'My search'}) :call setqflist([], 'r', {'title': 'My search'})

10
src/nvim/quickfix.c
View File

@ -1044,10 +1044,12 @@ qf_init_ext(
if (newlist || qi->qf_curlist == qi->qf_listcount) { if (newlist || qi->qf_curlist == qi->qf_listcount) {
// make place for a new list // make place for a new list
qf_new_list(qi, qf_title); qf_new_list(qi, qf_title);
} else if (qi->qf_lists[qi->qf_curlist].qf_count > 0) { } else {
// Adding to existing list, use last entry. // Adding to existing list, use last entry.
adding = true; adding = true;
old_last = qi->qf_lists[qi->qf_curlist].qf_last; if (qi->qf_lists[qi->qf_curlist].qf_count > 0) {
old_last = qi->qf_lists[qi->qf_curlist].qf_last;
}
} }
// Use the local value of 'errorformat' if it's set. // Use the local value of 'errorformat' if it's set.
@ -4209,7 +4211,8 @@ int get_errorlist_properties(win_T *wp, dict_T *what, dict_T *retdict)
if (qi->qf_lists[qf_idx].qf_ctx != NULL) { if (qi->qf_lists[qf_idx].qf_ctx != NULL) {
di = tv_dict_item_alloc_len(S_LEN("context")); di = tv_dict_item_alloc_len(S_LEN("context"));
tv_copy(qi->qf_lists[qf_idx].qf_ctx, &di->di_tv); tv_copy(qi->qf_lists[qf_idx].qf_ctx, &di->di_tv);
if (tv_dict_add(retdict, di) == FAIL) { status = tv_dict_add(retdict, di);
if (status == FAIL) {
tv_dict_item_free(di); tv_dict_item_free(di);
} }
} else { } else {
@ -4398,6 +4401,7 @@ static int qf_set_properties(qf_info_T *qi, dict_T *what, int action)
typval_T *ctx = xcalloc(1, sizeof(typval_T)); typval_T *ctx = xcalloc(1, sizeof(typval_T));
tv_copy(&di->di_tv, ctx); tv_copy(&di->di_tv, ctx);
qi->qf_lists[qf_idx].qf_ctx = ctx; qi->qf_lists[qf_idx].qf_ctx = ctx;
retval = OK;
} }
return retval; return retval;

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

@ -1702,7 +1702,8 @@ func Xproperty_tests(cchar)
Xopen Xopen
wincmd p wincmd p
call g:Xsetlist([{'filename':'foo', 'lnum':27}]) 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}) let d = g:Xgetlist({"title":1})
call assert_equal('Sample', d.title) call assert_equal('Sample', d.title)
@ -1756,7 +1757,8 @@ func Xproperty_tests(cchar)
endif endif
" Context related tests " 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() call test_garbagecollect_now()
let d = g:Xgetlist({'context':1}) let d = g:Xgetlist({'context':1})
call assert_equal([1,2,3], d.context) call assert_equal([1,2,3], d.context)
@ -1821,8 +1823,9 @@ func Xproperty_tests(cchar)
" Test for setting/getting items " Test for setting/getting items
Xexpr "" Xexpr ""
let qfprev = g:Xgetlist({'nr':0}) let qfprev = g:Xgetlist({'nr':0})
call g:Xsetlist([], ' ', {'title':'Green', let s = g:Xsetlist([], ' ', {'title':'Green',
\ 'items' : [{'filename':'F1', 'lnum':10}]}) \ 'items' : [{'filename':'F1', 'lnum':10}]})
call assert_equal(0, s)
let qfcur = g:Xgetlist({'nr':0}) let qfcur = g:Xgetlist({'nr':0})
call assert_true(qfcur.nr == qfprev.nr + 1) call assert_true(qfcur.nr == qfprev.nr + 1)
let l = g:Xgetlist({'items':1}) let l = g:Xgetlist({'items':1})