mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-16 14:56:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0733: keyword completion does not work with fuzzy

Browse Source 
Problem:  keyword completion does not work with fuzzy
          (egesip)
Solution: handle ctrl_x_mode_normal() specifically
          (glepnir)

fixes: vim/vim#15412
closes: vim/vim#15424

7cfe693f9b

Co-authored-by: glepnir <glephunter@gmail.com>
This commit is contained in:
zeertzjq
2024-09-16 09:10:51 +08:00
parent bf62672d59
commit fbac254511
3 changed files with 56 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/nvim/search.c
View File

@@ -3684,6 +3684,8 @@ bool search_for_fuzzy_match(buf_T *buf, pos_T *pos, char *pattern, int dir, pos_
pos_T circly_end;
bool found_new_match = false;
bool looped_around = false;
char *next_word_end = NULL;
char *match_word = NULL;
if (whole_line) {
current_pos.lnum += dir;
@@ -3715,6 +3717,27 @@ bool search_for_fuzzy_match(buf_T *buf, pos_T *pos, char *pattern, int dir, pos_
// Try to find a fuzzy match in the current line starting from current position
found_new_match = fuzzy_match_str_in_line(ptr, pattern, len, &current_pos);
if (found_new_match) {
if (ctrl_x_mode_normal()) {
match_word = xstrnsave(*ptr, (size_t)(*len));
if (strcmp(match_word, pattern) == 0) {
next_word_end = find_word_start(*ptr + *len);
if (*next_word_end != NUL && *next_word_end != NL) {
// Find end of the word.
while (*next_word_end != NUL) {
int l = utfc_ptr2len(next_word_end);
if (l < 2 && !vim_iswordc(*next_word_end)) {
break;
}
next_word_end += l;
}
} else if (looped_around) {
found_new_match = false;
}
*len = (int)(next_word_end - *ptr);
current_pos.col = *len;
}
xfree(match_word);
}
*pos = current_pos;
break;
} else if (looped_around && current_pos.lnum == circly_end.lnum) {