aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/quickfix.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/nvim/quickfix.c')
-rw-r--r--src/nvim/quickfix.c103
1 files changed, 55 insertions, 48 deletions
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 9d4fb52dc3..ced0cf0f80 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -3767,10 +3767,6 @@ void ex_cfile(exarg_T *eap)
qf_info_T *qi = &ql_info;
char_u *au_name = NULL;
- if (eap->cmdidx == CMD_lfile || eap->cmdidx == CMD_lgetfile
- || eap->cmdidx == CMD_laddfile)
- wp = curwin;
-
switch (eap->cmdidx) {
case CMD_cfile: au_name = (char_u *)"cfile"; break;
case CMD_cgetfile: au_name = (char_u *)"cgetfile"; break;
@@ -3786,6 +3782,13 @@ void ex_cfile(exarg_T *eap)
set_string_option_direct((char_u *)"ef", -1, eap->arg, OPT_FREE, 0);
char_u *enc = (*curbuf->b_p_menc != NUL) ? curbuf->b_p_menc : p_menc;
+
+ if (eap->cmdidx == CMD_lfile
+ || eap->cmdidx == CMD_lgetfile
+ || eap->cmdidx == CMD_laddfile) {
+ wp = curwin;
+ }
+
// This function is used by the :cfile, :cgetfile and :caddfile
// commands.
// :cfile always creates a new quickfix list and jumps to the
@@ -3820,6 +3823,18 @@ void ex_cfile(exarg_T *eap)
}
}
+// Return the quickfix/location list number with the given identifier.
+// Returns -1 if list is not found.
+static int qf_id2nr(const qf_info_T *const qi, const unsigned qfid)
+{
+ for (int qf_idx = 0; qf_idx < qi->qf_listcount; qf_idx++) {
+ if (qi->qf_lists[qf_idx].qf_id == qfid) {
+ return qf_idx;
+ }
+ }
+ return -1;
+}
+
/// Return the vimgrep autocmd name.
static char_u *vgr_get_auname(cmdidx_T cmdidx)
{
@@ -3900,32 +3915,25 @@ static buf_T *vgr_load_dummy_buf(char_u *fname, char_u *dirname_start,
/// Check whether a quickfix/location list is valid. Autocmds may remove or
/// change a quickfix list when vimgrep is running. If the list is not found,
/// create a new list.
-static bool vgr_qflist_valid(qf_info_T *qi, unsigned save_qfid,
- qfline_T *cur_qf_start, int loclist_cmd,
+static bool vgr_qflist_valid(win_T *wp, qf_info_T *qi, unsigned qfid,
char_u *title)
{
- if (loclist_cmd) {
- // Verify that the location list is still valid. An autocmd might have
- // freed the location list.
- if (!qflist_valid(curwin, save_qfid)) {
+ // Verify that the quickfix/location list was not freed by an autocmd
+ if (!qflist_valid(wp, qfid)) {
+ if (wp != NULL) {
+ // An autocmd has freed the location list
EMSG(_(e_loc_list_changed));
return false;
+ } else {
+ // Quickfix list is not found, create a new one.
+ qf_new_list(qi, title);
+ return true;
}
}
- if (cur_qf_start != qi->qf_lists[qi->qf_curlist].qf_start) {
- int idx;
+ if (qi->qf_lists[qi->qf_curlist].qf_id != qfid) {
// Autocommands changed the quickfix list. Find the one we were using
// and restore it.
- for (idx = 0; idx < LISTCOUNT; idx++) {
- if (cur_qf_start == qi->qf_lists[idx].qf_start) {
- qi->qf_curlist = idx;
- break;
- }
- }
- if (idx == LISTCOUNT) {
- // List cannot be found, create a new one.
- qf_new_list(qi, title);
- }
+ qi->qf_curlist = qf_id2nr(qi, qfid);
}
return true;
@@ -4025,9 +4033,7 @@ void ex_vimgrep(exarg_T *eap)
char_u *p;
int fi;
qf_info_T *qi = &ql_info;
- int loclist_cmd = false;
- qfline_T *cur_qf_start;
- win_T *wp;
+ win_T *wp = NULL;
buf_T *buf;
int duplicate_name = FALSE;
int using_dummy;
@@ -4056,7 +4062,7 @@ void ex_vimgrep(exarg_T *eap)
|| eap->cmdidx == CMD_lgrepadd
|| eap->cmdidx == CMD_lvimgrepadd) {
qi = ll_get_or_alloc_list(curwin);
- loclist_cmd = true;
+ wp = curwin;
}
if (eap->addr_count > 0)
@@ -4106,10 +4112,9 @@ void ex_vimgrep(exarg_T *eap)
* ":lcd %:p:h" changes the meaning of short path names. */
os_dirname(dirname_start, MAXPATHL);
- // Remember the current values of the quickfix list and qf_start, so that
- // we can check for autocommands changing the current quickfix list.
+ // Remember the current quickfix list identifier, so that we can check for
+ // autocommands changing the current quickfix list.
unsigned save_qfid = qi->qf_lists[qi->qf_curlist].qf_id;
- cur_qf_start = qi->qf_lists[qi->qf_curlist].qf_start;
seconds = (time_t)0;
for (fi = 0; fi < fcount && !got_int && tomatch > 0; fi++) {
@@ -4134,12 +4139,13 @@ void ex_vimgrep(exarg_T *eap)
using_dummy = false;
}
- // Check whether the quickfix list is still valid
- if (!vgr_qflist_valid(qi, save_qfid, cur_qf_start, loclist_cmd,
- *eap->cmdlinep)) {
+ // Check whether the quickfix list is still valid. When loading a
+ // buffer above, autocommands might have changed the quickfix list.
+ if (!vgr_qflist_valid(wp, qi, save_qfid, *eap->cmdlinep)) {
+ FreeWild(fcount, fnames);
goto theend;
}
- cur_qf_start = qi->qf_lists[qi->qf_curlist].qf_start;
+ save_qfid = qi->qf_lists[qi->qf_curlist].qf_id;
if (buf == NULL) {
if (!got_int)
@@ -4150,8 +4156,6 @@ void ex_vimgrep(exarg_T *eap)
found_match = vgr_match_buflines(qi, fname, buf, &regmatch, tomatch,
duplicate_name, flags);
- cur_qf_start = qi->qf_lists[qi->qf_curlist].qf_start;
-
if (using_dummy) {
if (found_match && first_match_buf == NULL)
first_match_buf = buf;
@@ -4222,7 +4226,6 @@ void ex_vimgrep(exarg_T *eap)
// The QuickFixCmdPost autocmd may free the quickfix list. Check the list
// is still valid.
- wp = loclist_cmd ? curwin : NULL;
if (!qflist_valid(wp, save_qfid)) {
goto theend;
}
@@ -4543,18 +4546,6 @@ static int qf_get_list_from_lines(dict_T *what, dictitem_T *di, dict_T *retdict)
return status;
}
-// Return the quickfix/location list number with the given identifier.
-// Returns -1 if list is not found.
-static int qf_id2nr(const qf_info_T *const qi, const unsigned qfid)
-{
- for (int qf_idx = 0; qf_idx < qi->qf_listcount; qf_idx++) {
- if (qi->qf_lists[qf_idx].qf_id == qfid) {
- return qf_idx;
- }
- }
- return -1;
-}
-
/// Return the quickfix/location list window identifier in the current tabpage.
static int qf_winid(qf_info_T *qi)
{
@@ -5166,6 +5157,16 @@ bool set_ref_in_quickfix(int copyID)
return abort;
}
}
+
+ if (IS_LL_WINDOW(win) && (win->w_llist_ref->qf_refcount == 1)) {
+ // In a location list window and none of the other windows is
+ // referring to this location list. Mark the location list
+ // context as still in use.
+ abort = mark_quickfix_ctx(win->w_llist_ref, copyID);
+ if (abort) {
+ return abort;
+ }
+ }
}
return abort;
@@ -5255,8 +5256,14 @@ void ex_cbuffer(exarg_T *eap)
qf_list_changed(qi, qi->qf_curlist);
}
if (au_name != NULL) {
+ const buf_T *const curbuf_old = curbuf;
apply_autocmds(EVENT_QUICKFIXCMDPOST, (char_u *)au_name,
curbuf->b_fname, true, curbuf);
+ if (curbuf != curbuf_old) {
+ // Autocommands changed buffer, don't jump now, "qi" may
+ // be invalid.
+ res = 0;
+ }
}
if (res > 0 && (eap->cmdidx == CMD_cbuffer
|| eap->cmdidx == CMD_lbuffer)) {
generated by cgit (git 2.34.1) at 2025-08-05 10:42:59 +0000