vim: src/quickfix.c comparison

comparison src/quickfix.c @ 16001:416e067411ab v8.1.1006

patch 8.1.1006: repeated code in quickfix support commit https://github.com/vim/vim/commit/4aa47b28f453b40d3b93ef209a3447c62b6f855b Author: Bram Moolenaar <Bram@vim.org> Date: Wed Mar 13 06:51:53 2019 +0100 patch 8.1.1006: repeated code in quickfix support Problem: Repeated code in quickfix support. Solution: Move code to functions. (Yegappan Lakshmanan, closes https://github.com/vim/vim/issues/4091)

author	Bram Moolenaar <Bram@vim.org>
date	Wed, 13 Mar 2019 07:00:07 +0100
parents	f376cd250b07
children	096b8ccd855e

comparison

equal deleted inserted replaced

-:4a614fe36b8d
+:416e067411ab
 static void	qf_fmt_text(char_u *text, char_u *buf, int bufsize);
 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 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_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 void	wipe_dummy_buffer(buf_T *buf, char_u *dirname_start);
 static void	unload_dummy_buffer(buf_T *buf, char_u *dirname_start);
 static qf_info_T *ll_get_or_alloc_list(win_T *);
 vim_snprintf((char *)qftitle_str, IOSIZE, ":%s", (char *)cmd);
 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
 * middle of the stack, then all the following lists are freed and then
 * the new list is added.
 */
 static void
 	    qi->qf_lists[i - 1] = qi->qf_lists[i];
 	qi->qf_curlist = LISTCOUNT - 1;
 }
 else
 	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)));
 qf_store_title(qfl, qf_title);
 qfl->qfl_type = qi->qfl_type;
 qfl->qf_id = ++last_qf_id;
 }
 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
 * window.
 */
 static int
 jump_to_help_window(qf_info_T *qi, int newwin, int *opened_window)
 	// When using location list, the new window should use the supplied
 	// location list. If the user asks to open a new window, then the new
 	// window will get a copy of the location list.
 	if (IS_LL_STACK(qi) && !newwin)
-	{
+	    win_set_loclist(curwin, qi);
-	    curwin->w_llist = qi;
-	    qi->qf_refcount++;
-	}
 }
 if (!p_im)
 	restart_edit = 0;	    // don't want insert mode in help file
 	return FAIL;		// not enough room for window
 p_swb = empty_option;	// don't split again
 swb_flags = 0;
 RESET_BINDING(curwin);
 if (ll_ref != NULL)
-{
 	// The new window should use the location list from the
 	// location list window
-	curwin->w_llist = ll_ref;
+	win_set_loclist(curwin, ll_ref);
-	ll_ref->qf_refcount++;
-}
 return OK;
 }
 /*
 * Go to a window that shows the right buffer. If the window is not found, go
 win_goto(win);
 // If the location list for the window is not set, then set it
 // to the location list from the location window
 if (win->w_llist == NULL)
-{
+	win_set_loclist(win, ll_ref);
-	win->w_llist = ll_ref;
-	if (ll_ref != NULL)
-	    ll_ref->qf_refcount++;
-}
 }
 /*
 * Go to a window that contains the specified buffer 'qf_fnum'. If a window is
 * not found, then go to the window just above the quickfix window. This is
 	qfline_T	*qf_ptr,
 	int		forceit,
 	int		prev_winid,
 	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;
 int		retval = OK;
 int		old_qf_curlist = qi->qf_curlist;
 int		save_qfid = qfl->qf_id;
 // Update the screen before showing the message, unless the screen
 // scrolled up.
 if (!msg_scrolled)
 	update_topline_redraw();
 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)") : "",
 	    (char *)qf_types(qf_ptr->qf_type, qf_ptr->qf_nr));
 // Add the message, skipping leading whitespace and newlines.
 len = (int)STRLEN(IObuff);
 qf_fmt_text(skipwhite(qf_ptr->qf_text), IObuff + len, IOSIZE - len);
 	return;
 }
 incr_quickfix_busy();
-qfl = &qi->qf_lists[qi->qf_curlist];
+qfl = qf_get_curlist(qi);
 qf_ptr = qfl->qf_ptr;
 old_qf_ptr = qf_ptr;
 qf_index = qfl->qf_index;
 old_qf_index = qf_index;
 if (!get_list_range(&arg, &idx1, &idx2) || *arg != NUL)
 {
 	emsg(_(e_trailing));
 	return;
 }
-qfl = &qi->qf_lists[qi->qf_curlist];
+qfl = qf_get_curlist(qi);
 if (plus)
 {
 	i = qfl->qf_index;
 	idx2 = i + idx1;
 	idx1 = i;
 	qi = GET_LOC_LIST(curwin);
 	if (qi == NULL)
 	    return;
 }
-qfl = &qi->qf_lists[qi->qf_curlist];
+qfl = qf_get_curlist(qi);
 // Look for an existing quickfix window.
 win = qf_find_win(qi);
 // If a quickfix window is open but we have no errors to display,
 	{
 	    decr_quickfix_busy();
 	    return;
 	}
-qfl = &qi->qf_lists[qi->qf_curlist];
+qfl = qf_get_curlist(qi);
 qf_set_title_var(qfl);
 // Save the current index here, as updating the quickfix buffer may free
 // the quickfix list
 lnum = qfl->qf_index;
 // Fill the buffer with the quickfix list.
-qf_fill_buffer(qi, curbuf, NULL);
+qf_fill_buffer(qfl, curbuf, NULL);
 decr_quickfix_busy();
 curwin->w_cursor.lnum = lnum;
 curwin->w_cursor.col = 0;
 if (IS_LL_WINDOW(wp))
 	// In the location list window, use the referenced location list
 	qi = wp->w_llist_ref;
-return qi->qf_lists[qi->qf_curlist].qf_index;
+return qf_get_curlist(qi)->qf_index;
 }
 /*
 * Update the cursor position in the quickfix window to the current error.
 * Return TRUE if there is a quickfix window.
 qf_win_pos_update(
 qf_info_T	*qi,
 int		old_qf_index)	// previous qf_index or zero
 {
 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
 // it's viewable.
 win = qf_find_win(qi);
 if (win != NULL
 if ((win = qf_find_win(qi)) != NULL)
 {
 	curwin_save = curwin;
 	curwin = win;
-	qf_set_title_var(&qi->qf_lists[qi->qf_curlist]);
+	qf_set_title_var(qf_get_curlist(qi));
 	curwin = curwin_save;
 }
 }
 /*
 	    // set curwin/curbuf to buf and save a few things
 	    aucmd_prepbuf(&aco, buf);
 	qf_update_win_titlevar(qi);
-	qf_fill_buffer(qi, buf, old_last);
+	qf_fill_buffer(qf_get_curlist(qi), buf, old_last);
 	++CHANGEDTICK(buf);
 	if (old_last == NULL)
 	{
 	    (void)qf_win_pos_update(qi, 0);
 * If "old_last" is not NULL append the items after this one.
 * When "old_last" is NULL then "buf" must equal "curbuf"!  Because
 * ml_delete() is used and autocommands will be triggered.
 */
 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;
 qfline_T	*qfp;
 int		old_KeyTyped = KeyTyped;
 	while ((curbuf->b_ml.ml_flags & ML_EMPTY) == 0)
 	    (void)ml_delete((linenr_T)1, FALSE);
 }
 // 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];
 	*dirname = NUL;
 	// Add one line for each error
 static int
 qf_restore_list(qf_info_T *qi, int_u save_qfid)
 {
 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);
 	if (curlist < 0)
 	    // list is not present
 	    return FAIL;
 	qi = GET_LOC_LIST(wp);
 	if (qi == NULL)
 	    goto cleanup;
 }
 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
 // 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)
 	apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
 					       curbuf->b_fname, TRUE, curbuf);
 if (res > 0 && !eap->forceit && qflist_valid(wp, save_qfid))
 	// display the first error
 	qi = GET_LOC_LIST(curwin);
 	if (qi == NULL)
 	    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;
 	    ++i, qfp = qfp->qf_next)
 {
 	if (qfp->qf_valid)
 	{
 	qi = GET_LOC_LIST(curwin);
 	if (qi == NULL)
 	    return 0;
 }
-return qi->qf_lists[qi->qf_curlist].qf_index;
+return qf_get_curlist(qi)->qf_index;
 }
 /*
 * Returns the current index in the quickfix/location list (counting only valid
 * entries). If no valid entries are in the list, then returns 1.
 	qi = GET_LOC_LIST(curwin);
 	if (qi == NULL)
 	    return 1;
 }
-qfl = &qi->qf_lists[qi->qf_curlist];
+qfl = qf_get_curlist(qi);
 qfp = qfl->qf_start;
 // check if the list has valid errors
 if (qfl->qf_count <= 0 || qfl->qf_nonevalid)
 	return 1;
 // For cdo and ldo commands, jump to the nth valid error.
 // For cfdo and lfdo commands, jump to the nth valid file entry.
 if (eap->cmdidx == CMD_cdo || eap->cmdidx == CMD_ldo
 	    || 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->cmdidx == CMD_cfdo || eap->cmdidx == CMD_lfdo);
 qf_jump(qi, 0, errornr, eap->forceit);
 }
 	    decr_quickfix_busy();
 	    return;
 	}
 }
 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)
 	apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name, NULL, FALSE, curbuf);
 // Jump to the first error for a new list and if autocmds didn't
 // free the list.
 return 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
 vgr_qflist_valid(
 	win_T	    *wp,
 	qf_info_T   *qi,
 incr_quickfix_busy();
 // Remember the current quickfix list identifier, so that we can 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;
 seconds = (time_t)0;
 for (fi = 0; fi < fcount && !got_int && tomatch > 0; ++fi)
 {
 	fname = shorten_fname1(fnames[fi]);
 	{
 	    FreeWild(fcount, fnames);
 	    decr_quickfix_busy();
 	    goto theend;
 	}
-	save_qfid = qi->qf_lists[qi->qf_curlist].qf_id;
+	save_qfid = qf_get_curlist(qi)->qf_id;
 	if (buf == NULL)
 	{
 	    if (!got_int)
 		smsg(_("Cannot open file \"%s\""), fname);
 	}
 }
 FreeWild(fcount, fnames);
-qfl = &qi->qf_lists[qi->qf_curlist];
+qfl = qf_get_curlist(qi);
 qfl->qf_nonevalid = FALSE;
 qfl->qf_ptr = qfl->qf_start;
 qfl->qf_index = 1;
 qf_list_changed(qfl);
 qfl->qf_ptr = qf_ptr;
 qfl->qf_index = newidx;
 // If the current list is modified and it is displayed in the quickfix
 // 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);
 return OK;
 }
 if (qfwin != NULL)
 {
 	// If the quickfix/location list window is open, then clear it
 	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);
 }
 if (wp != NULL && IS_LL_WINDOW(wp))
 {
 	// first free the list reference in the location list window
 	ll_free_all(&qfwin->w_llist_ref);
 	qfwin->w_llist_ref = new_ll;
 	if (wp != qfwin)
-	{
+	    win_set_loclist(wp, new_ll);
-	    wp->w_llist = new_ll;
-	    new_ll->qf_refcount++;
-	}
 }
 }
 /*
 * Populate the quickfix list with the items supplied in the list
 	retval = qf_set_properties(qi, what, action, title);
 else
 {
 	retval = qf_add_entries(qi, qi->qf_curlist, list, title, action);
 	if (retval == OK)
-	    qf_list_changed(&qi->qf_lists[qi->qf_curlist]);
+	    qf_list_changed(qf_get_curlist(qi));
 }
 decr_quickfix_busy();
 return retval;
 	    {
 		decr_quickfix_busy();
 		return;
 	    }
 	    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
 	    // 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)
 	    {
 		buf_T *curbuf_old = curbuf;
 		apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
 	    {
 		decr_quickfix_busy();
 		goto cleanup;
 	    }
 	    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
 	    // 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)
 		apply_autocmds(EVENT_QUICKFIXCMDPOST, au_name,
 						curbuf->b_fname, TRUE, curbuf);
 	    // Jump to the first error for a new list and if autocmds didn't
 	hgr_search_in_rtp(qi, &regmatch, lang);
 	vim_regfree(regmatch.regprog);
-	qfl = &qi->qf_lists[qi->qf_curlist];
+	qfl = qf_get_curlist(qi);
 	qfl->qf_nonevalid = FALSE;
 	qfl->qf_ptr = qfl->qf_start;
 	qfl->qf_index = 1;
 	qf_list_changed(qfl);
 	qf_update_buffer(qi, NULL);

Mercurial > vim

comparison src/quickfix.c @ 16001:416e067411ab v8.1.1006