mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-23 19:48:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.1135: 'suffixesadd' doesn't work with multiple items (#32573)

Browse Source 
Problem:  'suffixesadd' doesn't work with multiple items
          (after 9.1.1122).
Solution: Don't concat multiple suffixes together.
          (zeertzjq)

fixes: vim/vim#16694
closes: vim/vim#16699

bf595ae4ac
This commit is contained in:
zeertzjq
2025-02-22 16:38:12 +08:00
committed by GitHub
parent 8d7eb03040
commit 5cead869fb
3 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/file_search.c
View File

@@ -856,6 +856,7 @@ char *vim_findfile(void *search_ctx_arg)
// Try without extra suffix and then with suffixes
// from 'suffixesadd'.
len = file_path.size;
char *suf = search_ctx->ffsc_tagfile ? "" : curbuf->b_p_sua;
while (true) {
// if file exists and we didn't already find it
@@ -916,8 +917,8 @@ char *vim_findfile(void *search_ctx_arg)
break;
}
assert(MAXPATHL >= file_path.size);
file_path.size += copy_option_part(&suf, file_path.data + file_path.size,
MAXPATHL - file_path.size, ",");
file_path.size = len + copy_option_part(&suf, file_path.data + len,
MAXPATHL - len, ",");
}
}
} else {
@@ -1515,20 +1516,20 @@ char *find_file_in_path_option(char *ptr, size_t len, int options, int first, ch
}
// When the file doesn't exist, try adding parts of 'suffixesadd'.
size_t NameBufflen = l;
char *suffix = suffixes;
while (true) {
if ((os_path_exists(NameBuff)
&& (find_what == FINDFILE_BOTH
|| ((find_what == FINDFILE_DIR)
== os_isdir(NameBuff))))) {
file_name = xmemdupz(NameBuff, l);
|| ((find_what == FINDFILE_DIR) == os_isdir(NameBuff))))) {
file_name = xmemdupz(NameBuff, NameBufflen);
goto theend;
}
if (*suffix == NUL) {
break;
}
assert(MAXPATHL >= l);
l += copy_option_part(&suffix, NameBuff + l, MAXPATHL - l, ",");
NameBufflen = l + copy_option_part(&suffix, NameBuff + l, MAXPATHL - l, ",");
}
}
}