aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.1006: repeated code in quickfix support

Browse Source 
Problem:    Repeated code in quickfix support.
Solution:   Move code to functions. (Yegappan Lakshmanan, closes #4091)
This commit is contained in:
Bram Moolenaar 2019-03-13 06:51:53 +01:00
parent 55d81cd2a1
commit 4aa47b28f4
2 changed files with 63 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
src/quickfix.c
View File

@ -172,7 +172,7 @@ static int qf_win_pos_update(qf_info_T *qi, int old_qf_index);
static win_T *qf_find_win(qf_info_T *qi); static win_T *qf_find_win(qf_info_T *qi);
static buf_T *qf_find_buf(qf_info_T *qi); static buf_T *qf_find_buf(qf_info_T *qi);
static void qf_update_buffer(qf_info_T *qi, qfline_T *old_last); static void qf_update_buffer(qf_info_T *qi, qfline_T *old_last);
static void qf_fill_buffer(qf_info_T *qi, buf_T *buf, qfline_T *old_last); static void qf_fill_buffer(qf_list_T *qfl, buf_T *buf, qfline_T *old_last);
static buf_T *load_dummy_buffer(char_u *fname, char_u *dirname_start, char_u *resulting_dir); static buf_T *load_dummy_buffer(char_u *fname, char_u *dirname_start, char_u *resulting_dir);
static void wipe_dummy_buffer(buf_T *buf, char_u *dirname_start); static void wipe_dummy_buffer(buf_T *buf, char_u *dirname_start);
static void unload_dummy_buffer(buf_T *buf, char_u *dirname_start); static void unload_dummy_buffer(buf_T *buf, char_u *dirname_start);
@ -1802,6 +1802,15 @@ qf_cmdtitle(char_u *cmd)
return qftitle_str; return qftitle_str;
} }
/*
* Return a pointer to the current list in the specified quickfix stack
*/
static qf_list_T *
qf_get_curlist(qf_info_T *qi)
{
return &qi->qf_lists[qi->qf_curlist];
}
/* /*
* Prepare for adding a new quickfix list. If the current list is in the * Prepare for adding a new quickfix list. If the current list is in the
* middle of the stack, then all the following lists are freed and then * middle of the stack, then all the following lists are freed and then
@ -1830,7 +1839,7 @@ qf_new_list(qf_info_T *qi, char_u *qf_title)
} }
else else
qi->qf_curlist = qi->qf_listcount++; qi->qf_curlist = qi->qf_listcount++;
qfl = &qi->qf_lists[qi->qf_curlist]; qfl = qf_get_curlist(qi);
vim_memset(qfl, 0, (size_t)(sizeof(qf_list_T))); vim_memset(qfl, 0, (size_t)(sizeof(qf_list_T)));
qf_store_title(qfl, qf_title); qf_store_title(qfl, qf_title);
qfl->qfl_type = qi->qfl_type; qfl->qfl_type = qi->qfl_type;
@ -2725,6 +2734,16 @@ qf_find_help_win(void)
return NULL; return NULL;
} }
/*
* Set the location list for the specified window to 'qi'.
*/
static void
win_set_loclist(win_T *wp, qf_info_T *qi)
{
wp->w_llist = qi;
qi->qf_refcount++;
}
/* /*
* Find a help window or open one. If 'newwin' is TRUE, then open a new help * Find a help window or open one. If 'newwin' is TRUE, then open a new help
* window. * window.
@ -2766,10 +2785,7 @@ jump_to_help_window(qf_info_T *qi, int newwin, int *opened_window)
// location list. If the user asks to open a new window, then the new // location list. If the user asks to open a new window, then the new
// window will get a copy of the location list. // window will get a copy of the location list.
if (IS_LL_STACK(qi) && !newwin) if (IS_LL_STACK(qi) && !newwin)
{ win_set_loclist(curwin, qi);
curwin->w_llist = qi;
qi->qf_refcount++;
}
} }
if (!p_im) if (!p_im)
@ -2848,12 +2864,9 @@ qf_open_new_file_win(qf_info_T *ll_ref)
swb_flags = 0; swb_flags = 0;
RESET_BINDING(curwin); RESET_BINDING(curwin);
if (ll_ref != NULL) if (ll_ref != NULL)
{
// The new window should use the location list from the // The new window should use the location list from the
// location list window // location list window
curwin->w_llist = ll_ref; win_set_loclist(curwin, ll_ref);
ll_ref->qf_refcount++;
}
return OK; return OK;
} }
@ -2894,11 +2907,7 @@ qf_goto_win_with_ll_file(win_T *use_win, int qf_fnum, qf_info_T *ll_ref)
// If the location list for the window is not set, then set it // If the location list for the window is not set, then set it
// to the location list from the location window // to the location list from the location window
if (win->w_llist == NULL) if (win->w_llist == NULL)
{ win_set_loclist(win, ll_ref);
win->w_llist = ll_ref;
if (ll_ref != NULL)
ll_ref->qf_refcount++;
}
} }
/* /*
@ -3022,7 +3031,7 @@ qf_jump_edit_buffer(
int prev_winid, int prev_winid,
int *opened_window) int *opened_window)
{ {
qf_list_T *qfl = &qi->qf_lists[qi->qf_curlist]; qf_list_T *qfl = qf_get_curlist(qi);
qfltype_T qfl_type = qfl->qfl_type; qfltype_T qfl_type = qfl->qfl_type;
int retval = OK; int retval = OK;
int old_qf_curlist = qi->qf_curlist; int old_qf_curlist = qi->qf_curlist;
@ -3146,7 +3155,7 @@ qf_jump_print_msg(
if (!msg_scrolled) if (!msg_scrolled)
update_topline_redraw(); update_topline_redraw();
sprintf((char *)IObuff, _("(%d of %d)%s%s: "), qf_index, sprintf((char *)IObuff, _("(%d of %d)%s%s: "), qf_index,
qi->qf_lists[qi->qf_curlist].qf_count, qf_get_curlist(qi)->qf_count,
qf_ptr->qf_cleared ? _(" (line deleted)") : "", qf_ptr->qf_cleared ? _(" (line deleted)") : "",
(char *)qf_types(qf_ptr->qf_type, qf_ptr->qf_nr)); (char *)qf_types(qf_ptr->qf_type, qf_ptr->qf_nr));
// Add the message, skipping leading whitespace and newlines. // Add the message, skipping leading whitespace and newlines.
@ -3311,7 +3320,7 @@ qf_jump_newwin(qf_info_T *qi,
incr_quickfix_busy(); incr_quickfix_busy();
qfl = &qi->qf_lists[qi->qf_curlist]; qfl = qf_get_curlist(qi);
qf_ptr = qfl->qf_ptr; qf_ptr = qfl->qf_ptr;
old_qf_ptr = qf_ptr; old_qf_ptr = qf_ptr;
@ -3512,7 +3521,7 @@ qf_list(exarg_T *eap)
emsg(_(e_trailing)); emsg(_(e_trailing));
return; return;
} }
qfl = &qi->qf_lists[qi->qf_curlist]; qfl = qf_get_curlist(qi);
if (plus) if (plus)
{ {
i = qfl->qf_index; i = qfl->qf_index;
@ -3900,7 +3909,7 @@ ex_cwindow(exarg_T *eap)
return; return;
} }
qfl = &qi->qf_lists[qi->qf_curlist]; qfl = qf_get_curlist(qi);
// Look for an existing quickfix window. // Look for an existing quickfix window.
win = qf_find_win(qi); win = qf_find_win(qi);
@ -4120,14 +4129,14 @@ ex_copen(exarg_T *eap)
return; return;
} }
qfl = &qi->qf_lists[qi->qf_curlist]; qfl = qf_get_curlist(qi);
qf_set_title_var(qfl); qf_set_title_var(qfl);
// Save the current index here, as updating the quickfix buffer may free // Save the current index here, as updating the quickfix buffer may free
// the quickfix list // the quickfix list
lnum = qfl->qf_index; lnum = qfl->qf_index;
// Fill the buffer with the quickfix list. // Fill the buffer with the quickfix list.
qf_fill_buffer(qi, curbuf, NULL); qf_fill_buffer(qfl, curbuf, NULL);
decr_quickfix_busy(); decr_quickfix_busy();
@ -4195,7 +4204,7 @@ qf_current_entry(win_T *wp)
// In the location list window, use the referenced location list // In the location list window, use the referenced location list
qi = wp->w_llist_ref; qi = wp->w_llist_ref;
return qi->qf_lists[qi->qf_curlist].qf_index; return qf_get_curlist(qi)->qf_index;
} }
/* /*
@ -4208,7 +4217,7 @@ qf_win_pos_update(
int old_qf_index) // previous qf_index or zero int old_qf_index) // previous qf_index or zero
{ {
win_T *win; win_T *win;
int qf_index = qi->qf_lists[qi->qf_curlist].qf_index; int qf_index = qf_get_curlist(qi)->qf_index;
// Put the cursor on the current error in the quickfix window, so that // Put the cursor on the current error in the quickfix window, so that
// it's viewable. // it's viewable.
@ -4306,7 +4315,7 @@ qf_update_win_titlevar(qf_info_T *qi)
{ {
curwin_save = curwin; curwin_save = curwin;
curwin = win; curwin = win;
qf_set_title_var(&qi->qf_lists[qi->qf_curlist]); qf_set_title_var(qf_get_curlist(qi));
curwin = curwin_save; curwin = curwin_save;
} }
} }
@ -4333,7 +4342,7 @@ qf_update_buffer(qf_info_T *qi, qfline_T *old_last)
qf_update_win_titlevar(qi); qf_update_win_titlevar(qi);
qf_fill_buffer(qi, buf, old_last); qf_fill_buffer(qf_get_curlist(qi), buf, old_last);
++CHANGEDTICK(buf); ++CHANGEDTICK(buf);
if (old_last == NULL) if (old_last == NULL)
@ -4433,7 +4442,7 @@ qf_buf_add_line(buf_T *buf, linenr_T lnum, qfline_T *qfp, char_u *dirname)
* ml_delete() is used and autocommands will be triggered. * ml_delete() is used and autocommands will be triggered.
*/ */
static void static void
qf_fill_buffer(qf_info_T *qi, buf_T *buf, qfline_T *old_last) qf_fill_buffer(qf_list_T *qfl, buf_T *buf, qfline_T *old_last)
{ {
linenr_T lnum; linenr_T lnum;
qfline_T *qfp; qfline_T *qfp;
@ -4453,9 +4462,8 @@ qf_fill_buffer(qf_info_T *qi, buf_T *buf, qfline_T *old_last)
} }
// Check if there is anything to display // Check if there is anything to display
if (!qf_stack_empty(qi)) if (qfl != NULL)
{ {
qf_list_T *qfl = &qi->qf_lists[qi->qf_curlist];
char_u dirname[MAXPATHL]; char_u dirname[MAXPATHL];
*dirname = NUL; *dirname = NUL;
@ -4551,7 +4559,7 @@ qf_restore_list(qf_info_T *qi, int_u save_qfid)
{ {
int curlist; int curlist;
if (qi->qf_lists[qi->qf_curlist].qf_id != save_qfid) if (qf_get_curlist(qi)->qf_id != save_qfid)
{ {
curlist = qf_id2nr(qi, save_qfid); curlist = qf_id2nr(qi, save_qfid);
if (curlist < 0) if (curlist < 0)
@ -4769,11 +4777,11 @@ ex_make(exarg_T *eap)
goto cleanup; goto cleanup;
} }
if (res >= 0) if (res >= 0)
qf_list_changed(&qi->qf_lists[qi->qf_curlist]); qf_list_changed(qf_get_curlist(qi));
// Remember the current quickfix list identifier, so that we can // Remember the current quickfix list identifier, so that we can
// check for autocommands changing the current quickfix list. // check for autocommands changing the current quickfix list.
save_qfid = qi->qf_lists[qi->qf_curlist].qf_id; save_qfid = qf_get_curlist(qi)->qf_id;
if (au_name != NULL) if (au_name != NULL)
apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
curbuf->b_fname, TRUE, curbuf); curbuf->b_fname, TRUE, curbuf);
@ -4808,7 +4816,7 @@ qf_get_size(exarg_T *eap)
return 0; return 0;
} }
qfl = &qi->qf_lists[qi->qf_curlist]; qfl = qf_get_curlist(qi);
for (i = 0, qfp = qfl->qf_start; i < qfl->qf_count && qfp != NULL; for (i = 0, qfp = qfl->qf_start; i < qfl->qf_count && qfp != NULL;
++i, qfp = qfp->qf_next) ++i, qfp = qfp->qf_next)
{ {
@ -4845,7 +4853,7 @@ qf_get_cur_idx(exarg_T *eap)
return 0; return 0;
} }
return qi->qf_lists[qi->qf_curlist].qf_index; return qf_get_curlist(qi)->qf_index;
} }
/* /*
@ -4869,7 +4877,7 @@ qf_get_cur_valid_idx(exarg_T *eap)
return 1; return 1;
} }
qfl = &qi->qf_lists[qi->qf_curlist]; qfl = qf_get_curlist(qi);
qfp = qfl->qf_start; qfp = qfl->qf_start;
// check if the list has valid errors // check if the list has valid errors
@ -4985,7 +4993,7 @@ ex_cc(exarg_T *eap)
// For cfdo and lfdo commands, jump to the nth valid file entry. // For cfdo and lfdo commands, jump to the nth valid file entry.
if (eap->cmdidx == CMD_cdo || eap->cmdidx == CMD_ldo if (eap->cmdidx == CMD_cdo || eap->cmdidx == CMD_ldo
|| eap->cmdidx == CMD_cfdo || eap->cmdidx == CMD_lfdo) || eap->cmdidx == CMD_cfdo || eap->cmdidx == CMD_lfdo)
errornr = qf_get_nth_valid_entry(&qi->qf_lists[qi->qf_curlist], errornr = qf_get_nth_valid_entry(qf_get_curlist(qi),
eap->addr_count > 0 ? (int)eap->line1 : 1, eap->addr_count > 0 ? (int)eap->line1 : 1,
eap->cmdidx == CMD_cfdo || eap->cmdidx == CMD_lfdo); eap->cmdidx == CMD_cfdo || eap->cmdidx == CMD_lfdo);
@ -5114,8 +5122,8 @@ ex_cfile(exarg_T *eap)
} }
} }
if (res >= 0) if (res >= 0)
qf_list_changed(&qi->qf_lists[qi->qf_curlist]); qf_list_changed(qf_get_curlist(qi));
save_qfid = qi->qf_lists[qi->qf_curlist].qf_id; save_qfid = qf_get_curlist(qi)->qf_id;
if (au_name != NULL) if (au_name != NULL)
apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, NULL, FALSE, curbuf); apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, NULL, FALSE, curbuf);
@ -5236,9 +5244,9 @@ vgr_load_dummy_buf(
} }
/* /*
* Check whether a quickfix/location list valid. Autocmds may remove or change * Check whether a quickfix/location list is valid. Autocmds may remove or
* a quickfix list when vimgrep is running. If the list is not found, create a * change a quickfix list when vimgrep is running. If the list is not found,
* new list. * create a new list.
*/ */
static int static int
vgr_qflist_valid( vgr_qflist_valid(
@ -5479,7 +5487,7 @@ ex_vimgrep(exarg_T *eap)
// Remember the current quickfix list identifier, so that we can check for // Remember the current quickfix list identifier, so that we can check for
// autocommands changing the current quickfix list. // autocommands changing the current quickfix list.
save_qfid = qi->qf_lists[qi->qf_curlist].qf_id; save_qfid = qf_get_curlist(qi)->qf_id;
seconds = (time_t)0; seconds = (time_t)0;
for (fi = 0; fi < fcount && !got_int && tomatch > 0; ++fi) for (fi = 0; fi < fcount && !got_int && tomatch > 0; ++fi)
@ -5515,7 +5523,7 @@ ex_vimgrep(exarg_T *eap)
decr_quickfix_busy(); decr_quickfix_busy();
goto theend; goto theend;
} }
save_qfid = qi->qf_lists[qi->qf_curlist].qf_id; save_qfid = qf_get_curlist(qi)->qf_id;
if (buf == NULL) if (buf == NULL)
{ {
@ -5595,7 +5603,7 @@ ex_vimgrep(exarg_T *eap)
FreeWild(fcount, fnames); FreeWild(fcount, fnames);
qfl = &qi->qf_lists[qi->qf_curlist]; qfl = qf_get_curlist(qi);
qfl->qf_nonevalid = FALSE; qfl->qf_nonevalid = FALSE;
qfl->qf_ptr = qfl->qf_start; qfl->qf_ptr = qfl->qf_start;
qfl->qf_index = 1; qfl->qf_index = 1;
@ -6602,7 +6610,7 @@ qf_setprop_curidx(qf_info_T *qi, qf_list_T *qfl, dictitem_T *di)
// If the current list is modified and it is displayed in the quickfix // If the current list is modified and it is displayed in the quickfix
// window, then Update it. // window, then Update it.
if (qi->qf_lists[qi->qf_curlist].qf_id == qfl->qf_id) if (qf_get_curlist(qi)->qf_id == qfl->qf_id)
qf_win_pos_update(qi, old_qfidx); qf_win_pos_update(qi, old_qfidx);
return OK; return OK;
@ -6668,7 +6676,7 @@ qf_free_stack(win_T *wp, qf_info_T *qi)
{ {
// If the quickfix/location list window is open, then clear it // If the quickfix/location list window is open, then clear it
if (qi->qf_curlist < qi->qf_listcount) if (qi->qf_curlist < qi->qf_listcount)
qf_free(&qi->qf_lists[qi->qf_curlist]); qf_free(qf_get_curlist(qi));
qf_update_buffer(qi, NULL); qf_update_buffer(qi, NULL);
} }
@ -6700,10 +6708,7 @@ qf_free_stack(win_T *wp, qf_info_T *qi)
qfwin->w_llist_ref = new_ll; qfwin->w_llist_ref = new_ll;
if (wp != qfwin) if (wp != qfwin)
{ win_set_loclist(wp, new_ll);
wp->w_llist = new_ll;
new_ll->qf_refcount++;
}
} }
} }
@ -6745,7 +6750,7 @@ set_errorlist(
{ {
retval = qf_add_entries(qi, qi->qf_curlist, list, title, action); retval = qf_add_entries(qi, qi->qf_curlist, list, title, action);
if (retval == OK) if (retval == OK)
qf_list_changed(&qi->qf_lists[qi->qf_curlist]); qf_list_changed(qf_get_curlist(qi));
} }
decr_quickfix_busy(); decr_quickfix_busy();
@ -6900,11 +6905,11 @@ ex_cbuffer(exarg_T *eap)
return; return;
} }
if (res >= 0) if (res >= 0)
qf_list_changed(&qi->qf_lists[qi->qf_curlist]); qf_list_changed(qf_get_curlist(qi));
// Remember the current quickfix list identifier, so that we can // Remember the current quickfix list identifier, so that we can
// check for autocommands changing the current quickfix list. // check for autocommands changing the current quickfix list.
save_qfid = qi->qf_lists[qi->qf_curlist].qf_id; save_qfid = qf_get_curlist(qi)->qf_id;
if (au_name != NULL) if (au_name != NULL)
{ {
buf_T *curbuf_old = curbuf; buf_T *curbuf_old = curbuf;
@ -6991,11 +6996,11 @@ ex_cexpr(exarg_T *eap)
goto cleanup; goto cleanup;
} }
if (res >= 0) if (res >= 0)
qf_list_changed(&qi->qf_lists[qi->qf_curlist]); qf_list_changed(qf_get_curlist(qi));
// Remember the current quickfix list identifier, so that we can // Remember the current quickfix list identifier, so that we can
// check for autocommands changing the current quickfix list. // check for autocommands changing the current quickfix list.
save_qfid = qi->qf_lists[qi->qf_curlist].qf_id; save_qfid = qf_get_curlist(qi)->qf_id;
if (au_name != NULL) if (au_name != NULL)
apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
curbuf->b_fname, TRUE, curbuf); curbuf->b_fname, TRUE, curbuf);
@ -7259,7 +7264,7 @@ ex_helpgrep(exarg_T *eap)
vim_regfree(regmatch.regprog); vim_regfree(regmatch.regprog);
qfl = &qi->qf_lists[qi->qf_curlist]; qfl = qf_get_curlist(qi);
qfl->qf_nonevalid = FALSE; qfl->qf_nonevalid = FALSE;
qfl->qf_ptr = qfl->qf_start; qfl->qf_ptr = qfl->qf_start;
qfl->qf_index = 1; qfl->qf_index = 1;

2
src/version.c
View File

@ -779,6 +779,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1006,
/**/ /**/
1005, 1005,
/**/ /**/