thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.4406: expand functions use confusing argument names

Browse Source 
Problem:    Expand functions use confusing argument names.
Solution:   Rename "file" to "match".  Refactor some completion code.  Add a
            few more tests. (Yegappan Lakshmanan, closes #9790)
This commit is contained in:
Yegappan Lakshmanan
2022-02-17 11:26:42 +00:00
committed by Bram Moolenaar
parent 8329ab79b2
commit 2438430863
3 changed files with 307 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/testdir/test_usercommands.vim
View File

@@ -333,6 +333,14 @@ func Test_CmdCompletion()
call feedkeys(":com -complete=co\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"com -complete=color command compiler', @:)
" try completion for unsupported argument values
call feedkeys(":com -newarg=\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal("\"com -newarg=\t", @:)
" command completion after the name in a user defined command
call feedkeys(":com MyCmd chist\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal("\"com MyCmd chistory", @:)
command! DoCmd1 :
command! DoCmd2 :
call feedkeys(":com \<C-A>\<C-B>\"\<CR>", 'tx')
@@ -344,6 +352,10 @@ func Test_CmdCompletion()
call feedkeys(":delcom DoC\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"delcom DoCmd1 DoCmd2', @:)
" try argument completion for a command without completion
call feedkeys(":DoCmd1 \<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal("\"DoCmd1 \t", @:)
delcom DoCmd1
call feedkeys(":delcom DoC\<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"delcom DoCmd2', @:)
@@ -362,6 +374,21 @@ func Test_CmdCompletion()
call feedkeys(":DoCmd \<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"DoCmd mswin xterm', @:)
" Test for file name completion
com! -nargs=1 -complete=file DoCmd :
call feedkeys(":DoCmd READM\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"DoCmd README.txt', @:)
" Test for buffer name completion
com! -nargs=1 -complete=buffer DoCmd :
let bnum = bufadd('BufForUserCmd')
call setbufvar(bnum, '&buflisted', 1)
call feedkeys(":DoCmd BufFor\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"DoCmd BufForUserCmd', @:)
bwipe BufForUserCmd
call feedkeys(":DoCmd BufFor\<Tab>\<C-B>\"\<CR>", 'tx')
call assert_equal('"DoCmd BufFor', @:)
com! -nargs=* -complete=custom,CustomComplete DoCmd :
call feedkeys(":DoCmd \<C-A>\<C-B>\"\<CR>", 'tx')
call assert_equal('"DoCmd January February Mars', @:)
@@ -745,5 +772,30 @@ func Test_recursive_define()
endwhile
endfunc
" Test for using buffer-local ambiguous user-defined commands
func Test_buflocal_ambiguous_usercmd()
new
command -buffer -nargs=1 -complete=sign TestCmd1 echo "Hello"
command -buffer -nargs=1 -complete=sign TestCmd2 echo "World"
call assert_fails("call feedkeys(':TestCmd\<CR>', 'xt')", 'E464:')
call feedkeys(":TestCmd \<Tab>\<C-B>\"\<CR>", 'xt')
call assert_equal('"TestCmd ', @:)
delcommand TestCmd1
delcommand TestCmd2
bw!
endfunc
" Test for using a multibyte character in a user command
func Test_multibyte_in_usercmd()
command SubJapanesePeriodToDot exe "%s/\u3002/./g"
new
call setline(1, "Hello\u3002")
SubJapanesePeriodToDot
call assert_equal('Hello.', getline(1))
bw!
delcommand SubJapanesePeriodToDot
endfunc
" vim: shiftwidth=2 sts=2 expandtab