mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-07 10:26:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.1124: insert completion flags are mixed up

Browse Source 
Problem:    Insert completion flags are mixed up.
Solution:   Clean up flags use of ins_compl_add() and cp_flags.
d9eefe3155
This commit is contained in:
Jan Edmund Lazo
2019-08-20 21:14:18 -04:00
parent 0e8ee37efd
commit 3c28d75652
4 changed files with 153 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/search.c
View File

@@ -4683,8 +4683,7 @@ search_line:
}
if (matched) {
if (action == ACTION_EXPAND) {
int reuse = 0;
int add_r;
bool cont_s_ipos = false;
char_u *aux;
if (depth == -1 && lnum == curwin->w_cursor.lnum)
@@ -4738,7 +4737,7 @@ search_line:
p = aux + IOSIZE - i - 1;
STRNCPY(IObuff + i, aux, p - aux);
i += (int)(p - aux);
reuse |= CONT_S_IPOS;
cont_s_ipos = true;
}
IObuff[i] = NUL;
aux = IObuff;
@@ -4747,14 +4746,15 @@ search_line:
goto exit_matched;
}
add_r = ins_compl_add_infercase(aux, i, p_ic,
curr_fname == curbuf->b_fname ? NULL : curr_fname,
dir, reuse);
if (add_r == OK)
/* if dir was BACKWARD then honor it just once */
const int add_r = ins_compl_add_infercase(
aux, i, p_ic, curr_fname == curbuf->b_fname ? NULL : curr_fname,
dir, cont_s_ipos);
if (add_r == OK) {
// if dir was BACKWARD then honor it just once
dir = FORWARD;
else if (add_r == FAIL)
} else if (add_r == FAIL) {
break;
}
} else if (action == ACTION_SHOW_ALL) {
found = TRUE;
if (!did_show)