mirror of
https://github.com/vim/vim
synced 2025-07-15 16:51:57 +00:00
patch 9.1.1528: completion: crash with getcompletion()
Problem: completion: crash with getcompletion() (zeertzjq) Solution: Don't set may_expand_pattern in f_getcompletion(), unset may_expand_pattern() once it is not longer needed (Girish Palya). fixes: #17680 closes: #17686 Signed-off-by: Girish Palya <girishji@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
@ -233,7 +233,6 @@ nextwild(
|
|||||||
|
|
||||||
if (xp->xp_numfiles == -1)
|
if (xp->xp_numfiles == -1)
|
||||||
{
|
{
|
||||||
may_expand_pattern = options & WILD_MAY_EXPAND_PATTERN;
|
|
||||||
pre_incsearch_pos = xp->xp_pre_incsearch_pos;
|
pre_incsearch_pos = xp->xp_pre_incsearch_pos;
|
||||||
#ifdef FEAT_EVAL
|
#ifdef FEAT_EVAL
|
||||||
if (ccline->input_fn && ccline->xp_context == EXPAND_COMMANDS)
|
if (ccline->input_fn && ccline->xp_context == EXPAND_COMMANDS)
|
||||||
@ -244,7 +243,9 @@ nextwild(
|
|||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
|
may_expand_pattern = options & WILD_MAY_EXPAND_PATTERN;
|
||||||
set_expand_context(xp);
|
set_expand_context(xp);
|
||||||
|
may_expand_pattern = FALSE;
|
||||||
}
|
}
|
||||||
cmd_showtail = expand_showtail(xp);
|
cmd_showtail = expand_showtail(xp);
|
||||||
}
|
}
|
||||||
|
@ -4478,7 +4478,7 @@ func Test_search_complete()
|
|||||||
call feedkeys("gg/Fo\<tab>\<f9>", 'tx')
|
call feedkeys("gg/Fo\<tab>\<f9>", 'tx')
|
||||||
call assert_equal(['Foobar', 'FooBARR'], g:compl_info.matches)
|
call assert_equal(['Foobar', 'FooBARR'], g:compl_info.matches)
|
||||||
call feedkeys("gg/FO\<tab>\<f9>", 'tx')
|
call feedkeys("gg/FO\<tab>\<f9>", 'tx')
|
||||||
call assert_equal({}, g:compl_info)
|
call assert_equal({}, g:compl_info)
|
||||||
call feedkeys("gg/\\cFo\<tab>\<f9>", 'tx')
|
call feedkeys("gg/\\cFo\<tab>\<f9>", 'tx')
|
||||||
call assert_equal(['\cFoobar', '\cFooBAr', '\cFooBARR'], g:compl_info.matches)
|
call assert_equal(['\cFoobar', '\cFooBAr', '\cFooBARR'], g:compl_info.matches)
|
||||||
|
|
||||||
@ -4498,7 +4498,12 @@ func Test_search_complete()
|
|||||||
call feedkeys("gg/Fo\<tab>\<f9>", 'tx')
|
call feedkeys("gg/Fo\<tab>\<f9>", 'tx')
|
||||||
call assert_equal(['Foobar', 'FooBARR'], g:compl_info.matches)
|
call assert_equal(['Foobar', 'FooBARR'], g:compl_info.matches)
|
||||||
call feedkeys("gg/FO\<tab>\<f9>", 'tx')
|
call feedkeys("gg/FO\<tab>\<f9>", 'tx')
|
||||||
call assert_equal({}, g:compl_info)
|
call assert_equal({}, g:compl_info)
|
||||||
|
|
||||||
|
" Issue #17680 (getcompletion() does not support search completion)
|
||||||
|
let result = getcompletion('%s/', 'cmdline')
|
||||||
|
call assert_equal([], result)
|
||||||
|
|
||||||
call feedkeys("gg/foob\<tab>\<f9>", 'tx')
|
call feedkeys("gg/foob\<tab>\<f9>", 'tx')
|
||||||
call assert_equal(['foobar', 'foobarr'], g:compl_info.matches)
|
call assert_equal(['foobar', 'foobarr'], g:compl_info.matches)
|
||||||
call feedkeys("gg/\\Cfo\<tab>\<f9>", 'tx')
|
call feedkeys("gg/\\Cfo\<tab>\<f9>", 'tx')
|
||||||
@ -4603,43 +4608,43 @@ func Test_range_complete()
|
|||||||
|
|
||||||
for trig in ["\<tab>", "\<c-z>"]
|
for trig in ["\<tab>", "\<c-z>"]
|
||||||
call feedkeys($":%s/a{trig}\<f9>", 'xt')
|
call feedkeys($":%s/a{trig}\<f9>", 'xt')
|
||||||
call assert_equal(['ab', 'a', 'af'], g:compl_info.matches)
|
call assert_equal(['ab', 'a', 'af'], g:compl_info.matches)
|
||||||
call feedkeys($":vim9cmd :%s/a{trig}\<f9>", 'xt')
|
call feedkeys($":vim9cmd :%s/a{trig}\<f9>", 'xt')
|
||||||
call assert_equal(['ab', 'a', 'af'], g:compl_info.matches)
|
call assert_equal(['ab', 'a', 'af'], g:compl_info.matches)
|
||||||
endfor
|
endfor
|
||||||
|
|
||||||
call feedkeys(":%s/\<c-z>\<f9>", 'xt')
|
call feedkeys(":%s/\<c-z>\<f9>", 'xt')
|
||||||
call assert_equal({}, g:compl_info)
|
call assert_equal({}, g:compl_info)
|
||||||
|
|
||||||
for cmd in ['s', 'g']
|
for cmd in ['s', 'g']
|
||||||
call feedkeys(":1,2" . cmd . "/a\<c-z>\<f9>", 'xt')
|
call feedkeys($":1,2{cmd}/a\<c-z>\<f9>", 'xt')
|
||||||
call assert_equal(['ab', 'a'], g:compl_info.matches)
|
call assert_equal(['ab', 'a'], g:compl_info.matches)
|
||||||
endfor
|
endfor
|
||||||
|
|
||||||
1
|
1
|
||||||
call feedkeys(":.,+2s/a\<c-z>\<f9>", 'xt')
|
call feedkeys(":.,+2s/a\<c-z>\<f9>", 'xt')
|
||||||
call assert_equal(['ab', 'a'], g:compl_info.matches)
|
call assert_equal(['ab', 'a'], g:compl_info.matches)
|
||||||
|
|
||||||
/f
|
/f
|
||||||
call feedkeys(":1,s/b\<c-z>\<f9>", 'xt')
|
call feedkeys(":1,s/b\<c-z>\<f9>", 'xt')
|
||||||
call assert_equal(['b', 'ba'], g:compl_info.matches)
|
call assert_equal(['b', 'ba'], g:compl_info.matches)
|
||||||
|
|
||||||
/c
|
/c
|
||||||
call feedkeys(":\\?,4s/a\<c-z>\<f9>", 'xt')
|
call feedkeys(":\\?,4s/a\<c-z>\<f9>", 'xt')
|
||||||
call assert_equal(['a', 'af'], g:compl_info.matches)
|
call assert_equal(['a', 'af'], g:compl_info.matches)
|
||||||
|
|
||||||
%s/c/c/
|
%s/c/c/
|
||||||
call feedkeys(":1,\\&s/a\<c-z>\<f9>", 'xt')
|
call feedkeys(":1,\\&s/a\<c-z>\<f9>", 'xt')
|
||||||
call assert_equal(['ab', 'a'], g:compl_info.matches)
|
call assert_equal(['ab', 'a'], g:compl_info.matches)
|
||||||
|
|
||||||
3
|
3
|
||||||
normal! ma
|
normal! ma
|
||||||
call feedkeys(":'a,$s/a\<c-z>\<f9>", 'xt')
|
call feedkeys(":'a,$s/a\<c-z>\<f9>", 'xt')
|
||||||
call assert_equal(['a', 'af'], g:compl_info.matches)
|
call assert_equal(['a', 'af'], g:compl_info.matches)
|
||||||
|
|
||||||
" Line number followed by a search pattern ([start]/pattern/[command])
|
" Line number followed by a search pattern ([start]/pattern/[command])
|
||||||
call feedkeys("3/a\<c-z>\<f9>", 'xt')
|
call feedkeys("3/a\<c-z>\<f9>", 'xt')
|
||||||
call assert_equal(['a', 'af', 'ab'], g:compl_info.matches)
|
call assert_equal(['a', 'af', 'ab'], g:compl_info.matches)
|
||||||
|
|
||||||
bw!
|
bw!
|
||||||
call test_override("char_avail", 0)
|
call test_override("char_avail", 0)
|
||||||
|
@ -719,6 +719,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1528,
|
||||||
/**/
|
/**/
|
||||||
1527,
|
1527,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user