aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2020-01-26 19:54:26 -0800
committerGitHub <noreply@github.com>2020-01-26 19:54:26 -0800
commitd3a9d75c0462fea7b00e639d1b324bcf08a8b02d (patch)
tree28caf8951b81d9c44129fa9eaae7f76c4d021245 /src/nvim/testdir
parentb5daee7b8faaa00b83eb17ad231b8dbc417f628c (diff)
parent5ede2766c8d994f9e299288d46cefdd12ffee47f (diff)
downloadrneovim-d3a9d75c0462fea7b00e639d1b324bcf08a8b02d.tar.gz
rneovim-d3a9d75c0462fea7b00e639d1b324bcf08a8b02d.tar.bz2
rneovim-d3a9d75c0462fea7b00e639d1b324bcf08a8b02d.zip
Merge #11772 from janlazo/vim-8.2.0152
vim-patch:8.2.{152,158}
Diffstat (limited to 'src/nvim/testdir')
-rw-r--r--src/nvim/testdir/test_ins_complete.vim11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/nvim/testdir/test_ins_complete.vim b/src/nvim/testdir/test_ins_complete.vim
index e6d427db05..f4e6b698c6 100644
--- a/src/nvim/testdir/test_ins_complete.vim
+++ b/src/nvim/testdir/test_ins_complete.vim
@@ -130,7 +130,7 @@ func s:CompleteDone_CheckCompletedItemNone()
let s:called_completedone = 1
endfunc
-function! s:CompleteDone_CheckCompletedItemDict()
+func s:CompleteDone_CheckCompletedItemDict(pre)
call assert_equal( 'aword', v:completed_item[ 'word' ] )
call assert_equal( 'wrd', v:completed_item[ 'abbr' ] )
call assert_equal( 'extra text', v:completed_item[ 'menu' ] )
@@ -138,10 +138,12 @@ function! s:CompleteDone_CheckCompletedItemDict()
call assert_equal( 'W', v:completed_item[ 'kind' ] )
call assert_equal( 'test', v:completed_item[ 'user_data' ] )
- call assert_equal('function', complete_info().mode)
+ if a:pre
+ call assert_equal('function', complete_info().mode)
+ endif
let s:called_completedone = 1
-endfunction
+endfunc
func Test_CompleteDoneNone()
throw 'skipped: Nvim does not support v:none'
@@ -161,7 +163,8 @@ func Test_CompleteDoneNone()
endfunc
func Test_CompleteDoneDict()
- au CompleteDone * :call <SID>CompleteDone_CheckCompletedItemDict()
+ au CompleteDonePre * :call <SID>CompleteDone_CheckCompletedItemDict(1)
+ au CompleteDone * :call <SID>CompleteDone_CheckCompletedItemDict(0)
set completefunc=<SID>CompleteDone_CompleteFuncDict
execute "normal a\<C-X>\<C-U>\<C-Y>"