mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
vim-patch:8.0.0517: there is no way to remove quickfix lists
Problem: There is no way to remove quickfix lists (for testing).
Solution: Add the 'f' action to setqflist(). Add tests. (Yegappan
Lakshmanan)
b6fa30ccc3
This commit is contained in:
parent
6b5d92f9e0
commit
fb8592b7ba
@ -6855,16 +6855,19 @@ setqflist({list} [, {action}[, {what}]]) *setqflist()*
|
|||||||
Note that the list is not exactly the same as what
|
Note that the list is not exactly the same as what
|
||||||
|getqflist()| returns.
|
|getqflist()| returns.
|
||||||
|
|
||||||
*E927*
|
{action} values: *E927*
|
||||||
If {action} is set to 'a', then the items from {list} are
|
'a' The items from {list} are added to the existing
|
||||||
added to the existing quickfix list. If there is no existing
|
quickfix list. If there is no existing list, then a
|
||||||
list, then a new list is created.
|
new list is created.
|
||||||
|
|
||||||
If {action} is set to 'r', then the items from the current
|
'r' The items from the current quickfix list are replaced
|
||||||
quickfix list are replaced with the items from {list}. This
|
with the items from {list}. This can also be used to
|
||||||
can also be used to clear the list: >
|
clear the list: >
|
||||||
:call setqflist([], 'r')
|
:call setqflist([], 'r')
|
||||||
<
|
<
|
||||||
|
'f' All the quickfix lists in the quickfix stack are
|
||||||
|
freed.
|
||||||
|
|
||||||
If {action} is not present or is set to ' ', then a new list
|
If {action} is not present or is set to ' ', then a new list
|
||||||
is created.
|
is created.
|
||||||
|
|
||||||
|
@ -14594,7 +14594,8 @@ static void set_qf_ll_list(win_T *wp, typval_T *args, typval_T *rettv)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const char *const act = tv_get_string_chk(action_arg);
|
const char *const act = tv_get_string_chk(action_arg);
|
||||||
if ((*act == 'a' || *act == 'r' || *act == ' ') && act[1] == NUL) {
|
if ((*act == 'a' || *act == 'r' || *act == ' ' || *act == 'f')
|
||||||
|
&& act[1] == NUL) {
|
||||||
action = *act;
|
action = *act;
|
||||||
} else {
|
} else {
|
||||||
EMSG2(_(e_invact), act);
|
EMSG2(_(e_invact), act);
|
||||||
|
@ -4267,6 +4267,16 @@ static int qf_set_properties(qf_info_T *qi, dict_T *what, int action)
|
|||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void qf_free_stack(win_T *wp, qf_info_T *qi)
|
||||||
|
{
|
||||||
|
qf_free_all(wp);
|
||||||
|
if (wp == NULL) {
|
||||||
|
// quickfix list
|
||||||
|
qi->qf_curlist = 0;
|
||||||
|
qi->qf_listcount = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Populate the quickfix list with the items supplied in the list
|
// Populate the quickfix list with the items supplied in the list
|
||||||
// of dictionaries. "title" will be copied to w:quickfix_title
|
// of dictionaries. "title" will be copied to w:quickfix_title
|
||||||
// "action" is 'a' for add, 'r' for replace. Otherwise create a new list.
|
// "action" is 'a' for add, 'r' for replace. Otherwise create a new list.
|
||||||
@ -4280,7 +4290,10 @@ int set_errorlist(win_T *wp, list_T *list, int action, char_u *title,
|
|||||||
qi = ll_get_or_alloc_list(wp);
|
qi = ll_get_or_alloc_list(wp);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (what != NULL) {
|
if (action == 'f') {
|
||||||
|
// Free the entire quickfix or location list stack
|
||||||
|
qf_free_stack(wp, qi);
|
||||||
|
} else if (what != NULL) {
|
||||||
retval = qf_set_properties(qi, what, action);
|
retval = qf_set_properties(qi, what, action);
|
||||||
} else {
|
} else {
|
||||||
retval = qf_add_entries(qi, list, title, action);
|
retval = qf_add_entries(qi, list, title, action);
|
||||||
|
@ -38,6 +38,7 @@ func s:setup_commands(cchar)
|
|||||||
command! -nargs=* Xhelpgrep helpgrep <args>
|
command! -nargs=* Xhelpgrep helpgrep <args>
|
||||||
let g:Xgetlist = function('getqflist')
|
let g:Xgetlist = function('getqflist')
|
||||||
let g:Xsetlist = function('setqflist')
|
let g:Xsetlist = function('setqflist')
|
||||||
|
call setqflist([], 'f')
|
||||||
else
|
else
|
||||||
command! -nargs=* -bang Xlist <mods>llist<bang> <args>
|
command! -nargs=* -bang Xlist <mods>llist<bang> <args>
|
||||||
command! -nargs=* Xgetexpr <mods>lgetexpr <args>
|
command! -nargs=* Xgetexpr <mods>lgetexpr <args>
|
||||||
@ -69,6 +70,7 @@ func s:setup_commands(cchar)
|
|||||||
command! -nargs=* Xhelpgrep lhelpgrep <args>
|
command! -nargs=* Xhelpgrep lhelpgrep <args>
|
||||||
let g:Xgetlist = function('getloclist', [0])
|
let g:Xgetlist = function('getloclist', [0])
|
||||||
let g:Xsetlist = function('setloclist', [0])
|
let g:Xsetlist = function('setloclist', [0])
|
||||||
|
call setloclist(0, [], 'f')
|
||||||
endif
|
endif
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
@ -76,6 +78,9 @@ endfunc
|
|||||||
func XlistTests(cchar)
|
func XlistTests(cchar)
|
||||||
call s:setup_commands(a:cchar)
|
call s:setup_commands(a:cchar)
|
||||||
|
|
||||||
|
if a:cchar == 'l'
|
||||||
|
call assert_fails('llist', 'E776:')
|
||||||
|
endif
|
||||||
" With an empty list, command should return error
|
" With an empty list, command should return error
|
||||||
Xgetexpr []
|
Xgetexpr []
|
||||||
silent! Xlist
|
silent! Xlist
|
||||||
@ -146,6 +151,9 @@ endfunc
|
|||||||
func XageTests(cchar)
|
func XageTests(cchar)
|
||||||
call s:setup_commands(a:cchar)
|
call s:setup_commands(a:cchar)
|
||||||
|
|
||||||
|
let list = [{'bufnr': 1, 'lnum': 1}]
|
||||||
|
call g:Xsetlist(list)
|
||||||
|
|
||||||
" Jumping to a non existent list should return error
|
" Jumping to a non existent list should return error
|
||||||
silent! Xolder 99
|
silent! Xolder 99
|
||||||
call assert_true(v:errmsg ==# 'E380: At bottom of quickfix stack')
|
call assert_true(v:errmsg ==# 'E380: At bottom of quickfix stack')
|
||||||
@ -179,11 +187,7 @@ func XageTests(cchar)
|
|||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
func Test_cage()
|
func Test_cage()
|
||||||
let list = [{'bufnr': 1, 'lnum': 1}]
|
|
||||||
call setqflist(list)
|
|
||||||
call XageTests('c')
|
call XageTests('c')
|
||||||
|
|
||||||
call setloclist(0, list)
|
|
||||||
call XageTests('l')
|
call XageTests('l')
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
@ -192,6 +196,11 @@ endfunc
|
|||||||
func XwindowTests(cchar)
|
func XwindowTests(cchar)
|
||||||
call s:setup_commands(a:cchar)
|
call s:setup_commands(a:cchar)
|
||||||
|
|
||||||
|
" Opening the location list window without any errors should fail
|
||||||
|
if a:cchar == 'l'
|
||||||
|
call assert_fails('lopen', 'E776:')
|
||||||
|
endif
|
||||||
|
|
||||||
" Create a list with no valid entries
|
" Create a list with no valid entries
|
||||||
Xgetexpr ['non-error 1', 'non-error 2', 'non-error 3']
|
Xgetexpr ['non-error 1', 'non-error 2', 'non-error 3']
|
||||||
|
|
||||||
@ -232,6 +241,19 @@ func XwindowTests(cchar)
|
|||||||
" Calling cwindow should close the quickfix window with no valid errors
|
" Calling cwindow should close the quickfix window with no valid errors
|
||||||
Xwindow
|
Xwindow
|
||||||
call assert_true(winnr('$') == 1)
|
call assert_true(winnr('$') == 1)
|
||||||
|
|
||||||
|
if a:cchar == 'c'
|
||||||
|
" Opening the quickfix window in multiple tab pages should reuse the
|
||||||
|
" quickfix buffer
|
||||||
|
Xgetexpr ['Xtestfile1:1:3:Line1', 'Xtestfile2:2:2:Line2',
|
||||||
|
\ 'Xtestfile3:3:1:Line3']
|
||||||
|
Xopen
|
||||||
|
let qfbufnum = bufnr('%')
|
||||||
|
tabnew
|
||||||
|
Xopen
|
||||||
|
call assert_equal(qfbufnum, bufnr('%'))
|
||||||
|
new | only | tabonly
|
||||||
|
endif
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
func Test_cwindow()
|
func Test_cwindow()
|
||||||
@ -360,6 +382,13 @@ endfunc
|
|||||||
func Xtest_browse(cchar)
|
func Xtest_browse(cchar)
|
||||||
call s:setup_commands(a:cchar)
|
call s:setup_commands(a:cchar)
|
||||||
|
|
||||||
|
" Jumping to first or next location list entry without any error should
|
||||||
|
" result in failure
|
||||||
|
if a:cchar == 'l'
|
||||||
|
call assert_fails('lfirst', 'E776:')
|
||||||
|
call assert_fails('lnext', 'E776:')
|
||||||
|
endif
|
||||||
|
|
||||||
call s:create_test_file('Xqftestfile1')
|
call s:create_test_file('Xqftestfile1')
|
||||||
call s:create_test_file('Xqftestfile2')
|
call s:create_test_file('Xqftestfile2')
|
||||||
|
|
||||||
@ -1532,6 +1561,11 @@ endfunc
|
|||||||
func XbottomTests(cchar)
|
func XbottomTests(cchar)
|
||||||
call s:setup_commands(a:cchar)
|
call s:setup_commands(a:cchar)
|
||||||
|
|
||||||
|
" Calling lbottom without any errors should fail
|
||||||
|
if a:cchar == 'l'
|
||||||
|
call assert_fails('lbottom', 'E776:')
|
||||||
|
endif
|
||||||
|
|
||||||
call g:Xsetlist([{'filename': 'foo', 'lnum': 42}])
|
call g:Xsetlist([{'filename': 'foo', 'lnum': 42}])
|
||||||
Xopen
|
Xopen
|
||||||
let wid = win_getid()
|
let wid = win_getid()
|
||||||
@ -1553,10 +1587,9 @@ endfunc
|
|||||||
func HistoryTest(cchar)
|
func HistoryTest(cchar)
|
||||||
call s:setup_commands(a:cchar)
|
call s:setup_commands(a:cchar)
|
||||||
|
|
||||||
call assert_fails(a:cchar . 'older 99', 'E380:')
|
|
||||||
" clear all lists after the first one, then replace the first one.
|
" clear all lists after the first one, then replace the first one.
|
||||||
call g:Xsetlist([])
|
call g:Xsetlist([])
|
||||||
Xolder
|
call assert_fails('Xolder 99', 'E380:')
|
||||||
let entry = {'filename': 'foo', 'lnum': 42}
|
let entry = {'filename': 'foo', 'lnum': 42}
|
||||||
call g:Xsetlist([entry], 'r')
|
call g:Xsetlist([entry], 'r')
|
||||||
call g:Xsetlist([entry, entry])
|
call g:Xsetlist([entry, entry])
|
||||||
@ -1599,6 +1632,7 @@ func Xproperty_tests(cchar)
|
|||||||
call assert_fails('call g:Xsetlist([], "a", [])', 'E715:')
|
call assert_fails('call g:Xsetlist([], "a", [])', 'E715:')
|
||||||
|
|
||||||
" Set and get the title
|
" Set and get the title
|
||||||
|
call g:Xsetlist([])
|
||||||
Xopen
|
Xopen
|
||||||
wincmd p
|
wincmd p
|
||||||
call g:Xsetlist([{'filename':'foo', 'lnum':27}])
|
call g:Xsetlist([{'filename':'foo', 'lnum':27}])
|
||||||
|
Loading…
Reference in New Issue
Block a user