1
0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-02-09 12:40:05 +08:00

Merge pull request #436 from jetm/dev

Use on_event, instead of deprecated on_i
This commit is contained in:
Wang Shidong 2017-04-15 09:28:28 +08:00 committed by GitHub
commit aa4e80c0e3
3 changed files with 12 additions and 12 deletions

View File

@ -22,18 +22,18 @@
function! SpaceVim#layers#autocomplete#plugins() abort function! SpaceVim#layers#autocomplete#plugins() abort
let plugins = [ let plugins = [
\ ['honza/vim-snippets', { 'on_i' : 1, 'loadconf_before' : 1}], \ ['honza/vim-snippets', { 'on_event' : 'InsertEnter', 'loadconf_before' : 1}],
\ ['Shougo/neco-syntax', { 'on_i' : 1}], \ ['Shougo/neco-syntax', { 'on_event' : 'InsertEnter'}],
\ ['ujihisa/neco-look', { 'on_i' : 1}], \ ['ujihisa/neco-look', { 'on_event' : 'InsertEnter'}],
\ ['Shougo/context_filetype.vim', { 'on_i' : 1}], \ ['Shougo/context_filetype.vim', { 'on_event' : 'InsertEnter'}],
\ ['Shougo/neoinclude.vim', { 'on_i' : 1}], \ ['Shougo/neoinclude.vim', { 'on_event' : 'InsertEnter'}],
\ ['Shougo/neosnippet-snippets', { 'merged' : 0}], \ ['Shougo/neosnippet-snippets', { 'merged' : 0}],
\ ['Shougo/neopairs.vim', { 'on_i' : 1}], \ ['Shougo/neopairs.vim', { 'on_event' : 'InsertEnter'}],
\ ['Raimondi/delimitMate', { 'merged' : 0}], \ ['Raimondi/delimitMate', { 'merged' : 0}],
\ ] \ ]
" snippet " snippet
if g:spacevim_snippet_engine ==# 'neosnippet' if g:spacevim_snippet_engine ==# 'neosnippet'
call add(plugins, ['Shougo/neosnippet.vim', { 'on_i' : 1 , call add(plugins, ['Shougo/neosnippet.vim', { 'on_event' : 'InsertEnter',
\ 'on_ft' : 'neosnippet', \ 'on_ft' : 'neosnippet',
\ 'loadconf' : 1, \ 'loadconf' : 1,
\ 'on_cmd' : 'NeoSnippetEdit'}]) \ 'on_cmd' : 'NeoSnippetEdit'}])
@ -46,17 +46,17 @@ function! SpaceVim#layers#autocomplete#plugins() abort
call add(plugins, ['Valloric/YouCompleteMe', { 'loadconf_before' : 1, 'merged' : 0}]) call add(plugins, ['Valloric/YouCompleteMe', { 'loadconf_before' : 1, 'merged' : 0}])
elseif g:spacevim_autocomplete_method ==# 'neocomplete' elseif g:spacevim_autocomplete_method ==# 'neocomplete'
call add(plugins, ['Shougo/neocomplete', { call add(plugins, ['Shougo/neocomplete', {
\ 'on_i' : 1, \ 'on_event' : 'InsertEnter',
\ 'loadconf' : 1, \ 'loadconf' : 1,
\ }]) \ }])
elseif g:spacevim_autocomplete_method ==# 'neocomplcache' "{{{ elseif g:spacevim_autocomplete_method ==# 'neocomplcache' "{{{
call add(plugins, ['Shougo/neocomplcache.vim', { call add(plugins, ['Shougo/neocomplcache.vim', {
\ 'on_i' : 1, \ 'on_event' : 'InsertEnter',
\ 'loadconf' : 1, \ 'loadconf' : 1,
\ }]) \ }])
elseif g:spacevim_autocomplete_method ==# 'deoplete' elseif g:spacevim_autocomplete_method ==# 'deoplete'
call add(plugins, ['Shougo/deoplete.nvim', { call add(plugins, ['Shougo/deoplete.nvim', {
\ 'on_i' : 1, \ 'on_event' : 'InsertEnter',
\ 'loadconf' : 1, \ 'loadconf' : 1,
\ }]) \ }])
endif endif

View File

@ -16,7 +16,7 @@ function! SpaceVim#layers#edit#plugins() abort
\ ['floobits/floobits-neovim', { 'on_cmd' : ['FlooJoinWorkspace','FlooShareDirPublic','FlooShareDirPrivate']}], \ ['floobits/floobits-neovim', { 'on_cmd' : ['FlooJoinWorkspace','FlooShareDirPublic','FlooShareDirPrivate']}],
\ ] \ ]
if executable('fcitx') if executable('fcitx')
call add(plugins,['lilydjwg/fcitx.vim', { 'on_i' : 1}]) call add(plugins,['lilydjwg/fcitx.vim', { 'on_event' : 'InsertEnter'}])
endif endif
return plugins return plugins
endfunction endfunction

View File

@ -6,7 +6,7 @@ function! SpaceVim#layers#lang#vim#plugins() abort
\ ] \ ]
call add(plugins,['tweekmonster/exception.vim']) call add(plugins,['tweekmonster/exception.vim'])
call add(plugins,['mhinz/vim-lookup']) call add(plugins,['mhinz/vim-lookup'])
call add(plugins,['Shougo/neco-vim', { 'on_i' : 1, 'loadconf_before' : 1}]) call add(plugins,['Shougo/neco-vim', { 'on_event' : 'InsertEnter', 'loadconf_before' : 1}])
call add(plugins,['tweekmonster/helpful.vim', {'on_cmd': 'HelpfulVersion'}]) call add(plugins,['tweekmonster/helpful.vim', {'on_cmd': 'HelpfulVersion'}])
return plugins return plugins
endfunction endfunction