mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-07 18:36:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0248: duplicated quickfix code

Browse Source 
Problem:    duplicated quickfix code.
Solution:   Move the code to a function.
8d8a65e389
This commit is contained in:
Jan Edmund Lazo
2019-09-13 00:20:23 -04:00
parent 8ba492e4e2
commit 4ef9ad0514
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/nvim/quickfix.c
View File

@@ -3448,6 +3448,19 @@ static int qf_id2nr(const qf_info_T *const qi, const unsigned qfid)
return INVALID_QFIDX; return INVALID_QFIDX;
} }
// 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
{
// If autocommands changed the current list, then restore it
if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid) {
qi->qf_curlist = qf_id2nr(qi, save_qfid);
}
if (qi->qf_lists[qi->qf_curlist].qf_count > 0) {
qf_jump(qi, 0, 0, forceit);
}
}
/* /*
* Return TRUE when using ":vimgrep" for ":grep". * Return TRUE when using ":vimgrep" for ":grep".
*/ */
@@ -3549,11 +3562,8 @@ void ex_make(exarg_T *eap)
curbuf); curbuf);
} }
if (res > 0 && !eap->forceit && qflist_valid(wp, save_qfid)) { if (res > 0 && !eap->forceit && qflist_valid(wp, save_qfid)) {
// If autocommands changed the current list, then restore it. // display the first error
if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid) { qf_jump_first(qi, save_qfid, false);
qi->qf_curlist = qf_id2nr(qi, save_qfid);
}
qf_jump(qi, 0, 0, false); // display first error
} }
cleanup: cleanup:
@@ -3919,11 +3929,8 @@ void ex_cfile(exarg_T *eap)
// list. // list.
if (res > 0 && (eap->cmdidx == CMD_cfile || eap->cmdidx == CMD_lfile) if (res > 0 && (eap->cmdidx == CMD_cfile || eap->cmdidx == CMD_lfile)
&& qflist_valid(wp, save_qfid)) { && qflist_valid(wp, save_qfid)) {
// If autocommands changed the current list, then restore it // display the first error
if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid) { qf_jump_first(qi, save_qfid, eap->forceit);
qi->qf_curlist = qf_id2nr(qi, save_qfid);
}
qf_jump(qi, 0, 0, eap->forceit); // display first error
} }
} }
@@ -5421,11 +5428,8 @@ void ex_cbuffer(exarg_T *eap)
// free the list. // free the list.
if (res > 0 && (eap->cmdidx == CMD_cbuffer || eap->cmdidx == CMD_lbuffer) if (res > 0 && (eap->cmdidx == CMD_cbuffer || eap->cmdidx == CMD_lbuffer)
&& qflist_valid(wp, save_qfid)) { && qflist_valid(wp, save_qfid)) {
// If autocommands changed the current list, then restore it. // display the first error
if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid) { qf_jump_first(qi, save_qfid, eap->forceit);
qi->qf_curlist = qf_id2nr(qi, save_qfid);
}
qf_jump(qi, 0, 0, eap->forceit); // display first error
} }
} }
} }
@@ -5503,11 +5507,8 @@ void ex_cexpr(exarg_T *eap)
if (res > 0 if (res > 0
&& (eap->cmdidx == CMD_cexpr || eap->cmdidx == CMD_lexpr) && (eap->cmdidx == CMD_cexpr || eap->cmdidx == CMD_lexpr)
&& qflist_valid(wp, save_qfid)) { && qflist_valid(wp, save_qfid)) {
// If autocommands changed the current list, then restore it. // display the first error
if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid) { qf_jump_first(qi, save_qfid, eap->forceit);
qi->qf_curlist = qf_id2nr(qi, save_qfid);
}
qf_jump(qi, 0, 0, eap->forceit);
} }
} else { } else {
EMSG(_("E777: String or List expected")); EMSG(_("E777: String or List expected"));