mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-08-28 01:51:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.2299 (#6232)

Browse Source 
Problem:    QuickFixCmdPre and QuickFixCmdPost autocommands are not always
            triggered.
Solution:   Also trigger on ":expr", ":cbuffer", etc. (Yegappan Lakshmanan)

04c4ce650f
This commit is contained in:
Jurica Bradarić
2017-03-07 23:31:15 +01:00
committed by Justin M. Keyes
parent f613dd016a
commit 58b5e14387
3 changed files with 127 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
src/nvim/quickfix.c
View File

@@ -4278,14 +4278,46 @@ int set_errorlist(win_T *wp, list_T *list, int action, char_u *title,
*/
void ex_cbuffer(exarg_T *eap)
{
buf_T *buf = NULL;
qf_info_T *qi = &ql_info;
buf_T *buf = NULL;
qf_info_T *qi = &ql_info;
const char *au_name = NULL;
if (eap->cmdidx == CMD_lbuffer || eap->cmdidx == CMD_lgetbuffer
|| eap->cmdidx == CMD_laddbuffer) {
qi = ll_get_or_alloc_list(curwin);
}
switch (eap->cmdidx) {
case CMD_cbuffer:
au_name = "cbuffer";
break;
case CMD_cgetbuffer:
au_name = "cgetbuffer";
break;
case CMD_caddbuffer:
au_name = "caddbuffer";
break;
case CMD_lbuffer:
au_name = "lbuffer";
break;
case CMD_lgetbuffer:
au_name = "lgetbuffer";
break;
case CMD_laddbuffer:
au_name = "laddbuffer";
break;
default:
break;
}
if (au_name != NULL) {
apply_autocmds(EVENT_QUICKFIXCMDPRE, (char_u *)au_name,
curbuf->b_fname, true, curbuf);
if (did_throw || force_abort) {
return;
}
}
if (*eap->arg == NUL)
buf = curbuf;
else if (*skipwhite(skipdigits(eap->arg)) == NUL)
@@ -4312,13 +4344,17 @@ void ex_cbuffer(exarg_T *eap)
}
if (qf_init_ext(qi, NULL, buf, NULL, p_efm,
(eap->cmdidx != CMD_caddbuffer
&& eap->cmdidx != CMD_laddbuffer),
eap->line1, eap->line2,
qf_title) > 0
&& (eap->cmdidx == CMD_cbuffer
|| eap->cmdidx == CMD_lbuffer))
qf_jump(qi, 0, 0, eap->forceit); /* display first error */
(eap->cmdidx != CMD_caddbuffer
&& eap->cmdidx != CMD_laddbuffer),
eap->line1, eap->line2, qf_title) > 0) {
if (au_name != NULL) {
apply_autocmds(EVENT_QUICKFIXCMDPOST, (char_u *)au_name,
curbuf->b_fname, true, curbuf);
}
if (eap->cmdidx == CMD_cbuffer || eap->cmdidx == CMD_lbuffer) {
qf_jump(qi, 0, 0, eap->forceit); // display first error
}
}
}
}
}
@@ -4329,14 +4365,45 @@ void ex_cbuffer(exarg_T *eap)
*/
void ex_cexpr(exarg_T *eap)
{
typval_T *tv;
qf_info_T *qi = &ql_info;
typval_T *tv;
qf_info_T *qi = &ql_info;
const char *au_name = NULL;
if (eap->cmdidx == CMD_lexpr || eap->cmdidx == CMD_lgetexpr
|| eap->cmdidx == CMD_laddexpr) {
qi = ll_get_or_alloc_list(curwin);
}
switch (eap->cmdidx) {
case CMD_cexpr:
au_name = "cexpr";
break;
case CMD_cgetexpr:
au_name = "cgetexpr";
break;
case CMD_caddexpr:
au_name = "caddexpr";
break;
case CMD_lexpr:
au_name = "lexpr";
break;
case CMD_lgetexpr:
au_name = "lgetexpr";
break;
case CMD_laddexpr:
au_name = "laddexpr";
break;
default:
break;
}
if (au_name != NULL) {
apply_autocmds(EVENT_QUICKFIXCMDPRE, (char_u *)au_name,
curbuf->b_fname, true, curbuf);
if (did_throw || force_abort) {
return;
}
}
/* Evaluate the expression. When the result is a string or a list we can
* use it to fill the errorlist. */
tv = eval_expr(eap->arg, NULL);
@@ -4344,14 +4411,20 @@ void ex_cexpr(exarg_T *eap)
if ((tv->v_type == VAR_STRING && tv->vval.v_string != NULL)
|| (tv->v_type == VAR_LIST && tv->vval.v_list != NULL)) {
if (qf_init_ext(qi, NULL, NULL, tv, p_efm,
(eap->cmdidx != CMD_caddexpr
&& eap->cmdidx != CMD_laddexpr),
(linenr_T)0, (linenr_T)0, *eap->cmdlinep) > 0
&& (eap->cmdidx == CMD_cexpr
|| eap->cmdidx == CMD_lexpr))
qf_jump(qi, 0, 0, eap->forceit); /* display first error */
} else
(eap->cmdidx != CMD_caddexpr
&& eap->cmdidx != CMD_laddexpr),
(linenr_T)0, (linenr_T)0, *eap->cmdlinep) > 0) {
if (au_name != NULL) {
apply_autocmds(EVENT_QUICKFIXCMDPOST, (char_u *)au_name,
curbuf->b_fname, true, curbuf);
}
if (eap->cmdidx == CMD_cexpr || eap->cmdidx == CMD_lexpr) {
qf_jump(qi, 0, 0, eap->forceit); // display first error
}
}
} else {
EMSG(_("E777: String or List expected"));
}
free_tv(tv);
}
}