diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim index 74645221b..c928f14a7 100644 --- a/autoload/SpaceVim.vim +++ b/autoload/SpaceVim.vim @@ -544,7 +544,7 @@ function! SpaceVim#end() abort call add(g:spacevim_plugin_groups, 'colorscheme') endif - if has('nvim') + if has('python3') let g:spacevim_autocomplete_method = 'deoplete' elseif has('lua') let g:spacevim_autocomplete_method = 'neocomplete' diff --git a/autoload/SpaceVim/layers/autocomplete.vim b/autoload/SpaceVim/layers/autocomplete.vim index e4db51072..b482fbf7b 100644 --- a/autoload/SpaceVim/layers/autocomplete.vim +++ b/autoload/SpaceVim/layers/autocomplete.vim @@ -58,6 +58,10 @@ function! SpaceVim#layers#autocomplete#plugins() abort \ 'on_event' : 'InsertEnter', \ 'loadconf' : 1, \ }]) + if !has('nvim') + call add(plugins, ['SpaceVim/nvim-yarp', {'merged': 0}]) + call add(plugins, ['SpaceVim/vim-hug-neovim-rpc', {'merged': 0}]) + endif endif if has('patch-7.4.774') call add(plugins, ['Shougo/echodoc.vim', { @@ -67,6 +71,7 @@ function! SpaceVim#layers#autocomplete#plugins() abort \ }]) endif call add(plugins, ['tenfyzhong/CompleteParameter.vim', {'merged': 0}]) + call add(plugins, ['SpaceVim/LanguageClient-neovim', {'merged': 0}]) return plugins endfunction