kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-31 17:13:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0267: no good check if restoring quickfix list worked

Browse Source 
Problem:    No good check if restoring quickfix list worked.
Solution:   Let qf_restore_list() return OK/FAIL. (Yegappan Lakshmanan)
90f1e2b7bc
This commit is contained in:
Jan Edmund Lazo 2019-09-13 02:10:21 -04:00
parent 47357270ae
commit 5f95b35c7a
No known key found for this signature in database
GPG Key ID: 64915E6E9F735B15
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/nvim/quickfix.c
View File

@ -3459,25 +3459,30 @@ static int qf_id2nr(const qf_info_T *const qi, const unsigned qfid)
// If the current list is not "save_qfid" and we can find the list with that ID
// then make it the current list.
// This is used when autocommands may have changed the current list.
static void qf_restore_list(qf_info_T *qi, unsigned save_qfid)
FUNC_ATTR_NONNULL_ALL
// Returns OK if successfully restored the list. Returns FAIL if the list with
// the specified identifier (save_qfid) is not found in the stack.
static int qf_restore_list(qf_info_T *qi, unsigned save_qfid)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
{
if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid) {
const int curlist = qf_id2nr(qi, save_qfid);
if (curlist >= 0) {
if (curlist < 0) {
// list is not present
return FAIL;
}
qi->qf_curlist = curlist;
}
// else: what if the list can't be found?
}
return OK;
}
// Jump to the first entry if there is one.
static void qf_jump_first(qf_info_T *qi, unsigned save_qfid, int forceit)
FUNC_ATTR_NONNULL_ALL
{
qf_restore_list(qi, save_qfid);
// Autocommands might have cleared the list, check for it
if (qf_restore_list(qi, save_qfid) == FAIL) {
return;
}
// Autocommands might have cleared the list, check for that
if (!qf_list_empty(qi, qi->qf_curlist)) {
qf_jump(qi, 0, 0, forceit);
}
@ -4051,7 +4056,9 @@ static bool vgr_qflist_valid(win_T *wp, qf_info_T *qi, unsigned qfid,
return true;
}
}
qf_restore_list(qi, qfid);
if (qf_restore_list(qi, qfid) == FAIL) {
return false;
}
return true;
}
@ -4347,7 +4354,9 @@ void ex_vimgrep(exarg_T *eap)
goto theend;
}
qf_restore_list(qi, save_qfid);
if (qf_restore_list(qi, save_qfid) == FAIL) {
goto theend;
}
/* Jump to first match. */
if (qi->qf_lists[qi->qf_curlist].qf_count > 0) {