kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1735: Rename completion specific findex var

Browse Source 
Problem: Rename completion specific findex var
Solution: Move "findex" static variable to xp_selected in expand_T

closes: vim/vim#12548

e9ef347c13
This commit is contained in:
zeertzjq 2023-08-18 06:54:04 +08:00
parent 19d7fb8efe
commit 69aac643c4
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/cmdexpand.c
View File

@ -616,14 +616,14 @@ static void redraw_wildmenu(expand_T *xp, int num_matches, char **matches, int m
} }
/// Get the next or prev cmdline completion match. The index of the match is set /// Get the next or prev cmdline completion match. The index of the match is set
/// in "p_findex" /// in "xp->xp_selected"
static char *get_next_or_prev_match(int mode, expand_T *xp, int *p_findex, char *orig_save) static char *get_next_or_prev_match(int mode, expand_T *xp, char *orig_save)
{ {
if (xp->xp_numfiles <= 0) { if (xp->xp_numfiles <= 0) {
return NULL; return NULL;
} }
int findex = *p_findex; int findex = xp->xp_selected;
if (mode == WILD_PREV) { if (mode == WILD_PREV) {
if (findex == -1) { if (findex == -1) {
@ -696,7 +696,7 @@ static char *get_next_or_prev_match(int mode, expand_T *xp, int *p_findex, char
} else if (p_wmnu) { } else if (p_wmnu) {
redraw_wildmenu(xp, xp->xp_numfiles, xp->xp_files, findex, cmd_showtail); redraw_wildmenu(xp, xp->xp_numfiles, xp->xp_files, findex, cmd_showtail);
} }
*p_findex = findex; xp->xp_selected = findex;
return xstrdup(findex == -1 ? orig_save : xp->xp_files[findex]); return xstrdup(findex == -1 ? orig_save : xp->xp_files[findex]);
} }
@ -841,7 +841,6 @@ static char *find_longest_match(expand_T *xp, int options)
char *ExpandOne(expand_T *xp, char *str, char *orig, int options, int mode) char *ExpandOne(expand_T *xp, char *str, char *orig, int options, int mode)
{ {
char *ss = NULL; char *ss = NULL;
static int findex; // TODO(vim): Move into expand_T
static char *orig_save = NULL; // kept value of orig static char *orig_save = NULL; // kept value of orig
int orig_saved = false; int orig_saved = false;
@ -849,15 +848,15 @@ char *ExpandOne(expand_T *xp, char *str, char *orig, int options, int mode)
if (mode == WILD_NEXT || mode == WILD_PREV if (mode == WILD_NEXT || mode == WILD_PREV
|| mode == WILD_PAGEUP || mode == WILD_PAGEDOWN || mode == WILD_PAGEUP || mode == WILD_PAGEDOWN
|| mode == WILD_PUM_WANT) { || mode == WILD_PUM_WANT) {
return get_next_or_prev_match(mode, xp, &findex, orig_save); return get_next_or_prev_match(mode, xp, orig_save);
} }
if (mode == WILD_CANCEL) { if (mode == WILD_CANCEL) {
ss = xstrdup(orig_save ? orig_save : ""); ss = xstrdup(orig_save ? orig_save : "");
} else if (mode == WILD_APPLY) { } else if (mode == WILD_APPLY) {
ss = xstrdup(findex == -1 ss = xstrdup(xp->xp_selected == -1
? (orig_save ? orig_save : "") ? (orig_save ? orig_save : "")
: xp->xp_files[findex]); : xp->xp_files[xp->xp_selected]);
} }
// free old names // free old names
@ -871,10 +870,7 @@ char *ExpandOne(expand_T *xp, char *str, char *orig, int options, int mode)
cmdline_pum_remove(); cmdline_pum_remove();
} }
} }
// TODO(vim): Remove condition if "findex" is part of expand_T ? xp->xp_selected = 0;
if (mode != WILD_EXPAND_FREE && mode != WILD_ALL && mode != WILD_ALL_KEEP) {
findex = 0;
}
if (mode == WILD_FREE) { // only release file name if (mode == WILD_FREE) { // only release file name
return NULL; return NULL;
@ -891,7 +887,7 @@ char *ExpandOne(expand_T *xp, char *str, char *orig, int options, int mode)
// Find longest common part // Find longest common part
if (mode == WILD_LONGEST && xp->xp_numfiles > 0) { if (mode == WILD_LONGEST && xp->xp_numfiles > 0) {
ss = find_longest_match(xp, options); ss = find_longest_match(xp, options);
findex = -1; // next p_wc gets first one xp->xp_selected = -1; // next p_wc gets first one
} }
// Concatenate all matching names. Unless interrupted, this can be slow // Concatenate all matching names. Unless interrupted, this can be slow

1
src/nvim/ex_cmds_defs.h
View File

@ -244,6 +244,7 @@ struct expand {
#endif #endif
int xp_numfiles; // number of files found by file name completion int xp_numfiles; // number of files found by file name completion
int xp_col; // cursor position in line int xp_col; // cursor position in line
int xp_selected; // selected index in completion
char **xp_files; // list of files char **xp_files; // list of files
char *xp_line; // text being completed char *xp_line; // text being completed
#define EXPAND_BUF_LEN 256 #define EXPAND_BUF_LEN 256