Skip to content

Commit 383573b

Browse files
committed
Remove g:vsnip_integ_disable_on_complete_done
1 parent dba6556 commit 383573b

File tree

4 files changed

+21
-72
lines changed

4 files changed

+21
-72
lines changed

autoload/vsnip_integ.vim

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,16 +68,20 @@ endfunction
6868
" vsnip_integ#on_complete_done
6969
"
7070
function! vsnip_integ#on_complete_done(completed_item) abort
71-
if g:vsnip_integ_disable_on_complete_done
72-
return
73-
endif
74-
75-
if s:stop_complete_done | return | endif
76-
let s:stop_complete_done = v:true
77-
call timer_start(0, { -> execute('let s:stop_complete_done = v:false') })
78-
7971
let l:context = s:extract_user_data(a:completed_item)
8072
if !empty(l:context)
73+
74+
" disable `on_complete_done` for completion-nvim.
75+
if index(l:context.sources, 'completion_nvim') >= 0
76+
if vsnip_integ#detection#exists('completion_nvim')
77+
return
78+
endif
79+
endif
80+
81+
if s:stop_complete_done | return | endif
82+
let s:stop_complete_done = v:true
83+
call timer_start(0, { -> execute('let s:stop_complete_done = v:false') })
84+
8185
let s:context = extend(l:context, {
8286
\ 'done_line': getline('.'),
8387
\ 'done_pos': getcurpos(),

autoload/vsnip_integ/integration/completion_nvim.vim

Lines changed: 0 additions & 7 deletions
This file was deleted.

doc/vsnip_integ.txt

Lines changed: 9 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -6,70 +6,23 @@ vim-vsnip integrations.
66
==============================================================================
77
CONTENTS *vsnip-integ-contents*
88

9-
VARIABLE |vsnip-integ-variable|
9+
INSTALL |vsnip-integ-install|
1010

1111

1212

1313
==============================================================================
14-
VARIABLE *vsnip-integ-variable*
14+
INSTALL *vsnip-integ-install*
1515

16-
>
17-
let g:vsnip_integ_config.auto_expand = v:false
18-
<
19-
Enable or disable auto expansion for snippet completion.
16+
You can use your favorite plugin manager.
2017

2118
>
22-
let g:vsnip_integ_config.vim_lsp = v:true
23-
<
24-
Enable or disable |vim-lsp| integration.
19+
" dein.vim
20+
call dein#add('hrsh7th/vim-vsnip-integ')
2521

22+
" vim-plug
23+
Plug 'hrsh7th/vim-vsnip-integ'
2624

27-
>
28-
let g:vsnip_integ_config.vim_lsc = v:true
29-
<
30-
Enable or disable |vim-lsc| integration.
31-
32-
33-
>
34-
let g:vsnip_integ_config.lamp = v:true
35-
<
36-
Enable or disable |lamp| integration.
37-
38-
39-
>
40-
let g:vsnip_integ_config.deoplete_lsp = v:true
41-
<
42-
Enable or disable |deoplete-lsp| integration.
43-
44-
45-
>
46-
let g:vsnip_integ_config.nvim_lsp = v:false
47-
<
48-
Enable or disable |nvim-lsp|'s omnifunc integration.
49-
50-
NOTE: This integration currently not working. It is reserved flag.
51-
52-
53-
>
54-
let g:vsnip_integ_config.language_client_neovim = v:true
55-
<
56-
Enable or disable |language-client-neovim| integration.
57-
58-
59-
>
60-
let g:vsnip_integ_config.asyncomplete = v:true
61-
<
62-
Enable or disable |asyncomplete| integration.
63-
64-
65-
>
66-
let g:vsnip_integ_config.deoplete = v:true
67-
<
68-
Enable or disable |deoplete| integration.
69-
70-
71-
>
72-
let g:vsnip_integ_config.mucomplete = v:true
25+
" neobundle
26+
NeoBundle 'hrsh7th/vim-vsnip-integ'
7327
<
74-
Enable or disable |mucomplete| integration.
7528

plugin/vsnip_integ.vim

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ endif
44
let g:loaded_vsnip_integ = v:true
55

66
let g:vsnip_integ_debug = get(g:, 'vsnip_integ_debug', v:false)
7-
let g:vsnip_integ_disable_on_complete_done = get(g:, 'vsnip_integ_disable_on_complete_done', v:false)
87

98
augroup vsnip_integ
109
autocmd!

0 commit comments

Comments
 (0)