wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(completion): filter results with complete+=f (#26029)

Browse Source
This commit is contained in:
Raphael 2023-11-18 12:26:52 +08:00 committed by GitHub
parent abac33605f
commit cdc8bacc79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/insexpand.c
View File

@ -3325,24 +3325,10 @@ static void get_next_bufname_token(void)
{
FOR_ALL_BUFFERS(b) {
if (b->b_p_bl && b->b_sfname != NULL) {
char *start = get_past_head(b->b_sfname);
char *current = start;
char *p = (char *)path_next_component(start);
while (true) {
int len = (int)(p - current) - (*p == NUL ? 0 : 1);
// treat . as a separator, unless it is the first char in a filename
char *dot = strchr(current, '.');
if (dot && *p == NUL && *current != '.') {
len = (int)(dot - current);
p = dot + 1;
}
ins_compl_add(current, len, NULL, NULL, false, NULL, 0,
char *tail = path_tail(b->b_sfname);
if (strncmp(tail, compl_orig_text, strlen(compl_orig_text)) == 0) {
ins_compl_add(tail, (int)strlen(tail), NULL, NULL, false, NULL, 0,
p_ic ? CP_ICASE : 0, false);
if (*p == NUL) {
break;
}
current = p;
p = (char *)path_next_component(p);
}
}
}

27
test/functional/editor/completion_spec.lua
View File

@ -1231,25 +1231,30 @@ describe('completion', function()
it('complete with f flag #25598', function()
screen:try_resize(20, 9)
local bufname = 'foo/bar.txt'
local hidden = 'fooA/.hidden'
if helpers.is_os('win') then
bufname = 'C:\\foo\\bar.txt'
hidden = 'C:\\fooA\\.hidden'
end
command('set complete+=f | edit '..bufname..' | edit '..hidden..' | enew')
command('set complete+=f | edit foo | edit bar |edit foa |edit .hidden')
feed('i<C-n>')
screen:expect{grid=[[
foo^ |
{2:foo }{0: }|
{1:bar }{0: }|
{1:txt }{0: }|
{1:fooA }{0: }|
{1:foa }{0: }|
{1:.hidden }{0: }|
{0:~ }|
{0:~ }|
{3:-- }{4:match 1 of 5} |
{0:~ }|
{3:-- }{4:match 1 of 4} |
]]}
feed('<Esc>ccf<C-n>')
screen:expect{grid=[[
foo^ |
{2:foo }{0: }|
{1:foa }{0: }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{3:-- }{4:match 1 of 2} |
]]}
end)
end)