mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.2.1901: variable completion does not work in command line window
Problem: Variable completion does not work in command line window. Solution: Use the "prevwin". (closes #7198)
This commit is contained in:
parent
02194d2bd5
commit
4ff2f2fb6b
@ -1981,7 +1981,13 @@ get_user_var_name(expand_T *xp, int idx)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// b: variables
|
// b: variables
|
||||||
ht = &curbuf->b_vars->dv_hashtab;
|
ht =
|
||||||
|
#ifdef FEAT_CMDWIN
|
||||||
|
// In cmdwin, the alternative buffer should be used.
|
||||||
|
(cmdwin_type != 0 && get_cmdline_type() == NUL) ?
|
||||||
|
&prevwin->w_buffer->b_vars->dv_hashtab :
|
||||||
|
#endif
|
||||||
|
&curbuf->b_vars->dv_hashtab;
|
||||||
if (bdone < ht->ht_used)
|
if (bdone < ht->ht_used)
|
||||||
{
|
{
|
||||||
if (bdone++ == 0)
|
if (bdone++ == 0)
|
||||||
@ -1994,7 +2000,13 @@ get_user_var_name(expand_T *xp, int idx)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// w: variables
|
// w: variables
|
||||||
ht = &curwin->w_vars->dv_hashtab;
|
ht =
|
||||||
|
#ifdef FEAT_CMDWIN
|
||||||
|
// In cmdwin, the alternative window should be used.
|
||||||
|
(cmdwin_type != 0 && get_cmdline_type() == NUL) ?
|
||||||
|
&prevwin->w_vars->dv_hashtab :
|
||||||
|
#endif
|
||||||
|
&curwin->w_vars->dv_hashtab;
|
||||||
if (wdone < ht->ht_used)
|
if (wdone < ht->ht_used)
|
||||||
{
|
{
|
||||||
if (wdone++ == 0)
|
if (wdone++ == 0)
|
||||||
|
@ -346,7 +346,10 @@ func Test_compl_in_cmdwin()
|
|||||||
set wildmenu wildchar=<Tab>
|
set wildmenu wildchar=<Tab>
|
||||||
com! -nargs=1 -complete=command GetInput let input = <q-args>
|
com! -nargs=1 -complete=command GetInput let input = <q-args>
|
||||||
com! -buffer TestCommand echo 'TestCommand'
|
com! -buffer TestCommand echo 'TestCommand'
|
||||||
|
let w:test_winvar = 'winvar'
|
||||||
|
let b:test_bufvar = 'bufvar'
|
||||||
|
|
||||||
|
" User-defined commands
|
||||||
let input = ''
|
let input = ''
|
||||||
call feedkeys("q:iGetInput T\<C-x>\<C-v>\<CR>", 'tx!')
|
call feedkeys("q:iGetInput T\<C-x>\<C-v>\<CR>", 'tx!')
|
||||||
call assert_equal('TestCommand', input)
|
call assert_equal('TestCommand', input)
|
||||||
@ -355,8 +358,30 @@ func Test_compl_in_cmdwin()
|
|||||||
call feedkeys("q::GetInput T\<Tab>\<CR>:q\<CR>", 'tx!')
|
call feedkeys("q::GetInput T\<Tab>\<CR>:q\<CR>", 'tx!')
|
||||||
call assert_equal('T', input)
|
call assert_equal('T', input)
|
||||||
|
|
||||||
|
|
||||||
|
com! -nargs=1 -complete=var GetInput let input = <q-args>
|
||||||
|
" Window-local variables
|
||||||
|
let input = ''
|
||||||
|
call feedkeys("q:iGetInput w:test_\<C-x>\<C-v>\<CR>", 'tx!')
|
||||||
|
call assert_equal('w:test_winvar', input)
|
||||||
|
|
||||||
|
let input = ''
|
||||||
|
call feedkeys("q::GetInput w:test_\<Tab>\<CR>:q\<CR>", 'tx!')
|
||||||
|
call assert_equal('w:test_', input)
|
||||||
|
|
||||||
|
" Buffer-local variables
|
||||||
|
let input = ''
|
||||||
|
call feedkeys("q:iGetInput b:test_\<C-x>\<C-v>\<CR>", 'tx!')
|
||||||
|
call assert_equal('b:test_bufvar', input)
|
||||||
|
|
||||||
|
let input = ''
|
||||||
|
call feedkeys("q::GetInput b:test_\<Tab>\<CR>:q\<CR>", 'tx!')
|
||||||
|
call assert_equal('b:test_', input)
|
||||||
|
|
||||||
delcom TestCommand
|
delcom TestCommand
|
||||||
delcom GetInput
|
delcom GetInput
|
||||||
|
unlet w:test_winvar
|
||||||
|
unlet b:test_bufvar
|
||||||
set wildmenu& wildchar&
|
set wildmenu& wildchar&
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
@ -750,6 +750,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 */
|
||||||
|
/**/
|
||||||
|
1901,
|
||||||
/**/
|
/**/
|
||||||
1900,
|
1900,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user