From 62d58977bfb92aed7648f90a594e24335178f9b1 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Sun, 12 Nov 2017 22:28:56 +0800 Subject: [PATCH 1/3] Enable deoplete in vim8 --- autoload/SpaceVim.vim | 2 +- autoload/SpaceVim/layers/autocomplete.vim | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 From a7a5c91e56bee8edcd6bb4af30969bd8f725b9eb Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Mon, 13 Nov 2017 20:04:03 +0800 Subject: [PATCH 2/3] Disable LanguageClient by default --- config/plugins/deoplete.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/plugins/deoplete.vim b/config/plugins/deoplete.vim index 3f6e90079..836c25f28 100644 --- a/config/plugins/deoplete.vim +++ b/config/plugins/deoplete.vim @@ -90,7 +90,7 @@ let g:deoplete#keyword_patterns.clojure = '[\w!$%&*+/:<=>?@\^_~\-\.#]*' " public settings call deoplete#custom#set('_', 'matchers', ['matcher_full_fuzzy']) -let g:deoplete#ignore_sources._ = get(g:deoplete#ignore_sources, '_', ['around']) +let g:deoplete#ignore_sources._ = get(g:deoplete#ignore_sources, '_', ['around', 'LanguageClient']) inoremap deoplete#mappings#smart_close_popup()."\" inoremap deoplete#mappings#smart_close_popup()."\" set isfname-== From 65f66e2aeab663d88d8173743d4fddc1230ac6e4 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Mon, 13 Nov 2017 20:14:46 +0800 Subject: [PATCH 3/3] Fix issue with LanguageClient-neovim && deoplete fix https://github.com/autozimu/LanguageClient-neovim/issues/169 --- config/plugins/deoplete.vim | 5 +++++ docs/layers/autocomplete.md | 22 +++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/config/plugins/deoplete.vim b/config/plugins/deoplete.vim index 836c25f28..40b1a2eb8 100644 --- a/config/plugins/deoplete.vim +++ b/config/plugins/deoplete.vim @@ -91,6 +91,11 @@ let g:deoplete#keyword_patterns.clojure = '[\w!$%&*+/:<=>?@\^_~\-\.#]*' " public settings call deoplete#custom#set('_', 'matchers', ['matcher_full_fuzzy']) let g:deoplete#ignore_sources._ = get(g:deoplete#ignore_sources, '_', ['around', 'LanguageClient']) +for key in keys(g:deoplete#ignore_sources) + if key != '_' && index(keys(get(g:, 'LanguageClient_serverCommands', {})), key) == -1 + let g:deoplete#ignore_sources[key] = g:deoplete#ignore_sources[key] + ['around', 'LanguageClient'] + endif +endfor inoremap deoplete#mappings#smart_close_popup()."\" inoremap deoplete#mappings#smart_close_popup()."\" set isfname-== diff --git a/docs/layers/autocomplete.md b/docs/layers/autocomplete.md index 157edabcf..1bb545b2a 100644 --- a/docs/layers/autocomplete.md +++ b/docs/layers/autocomplete.md @@ -5,15 +5,17 @@ title: "SpaceVim autocomplete layer" # [SpaceVim Layers:](https://spacevim.org/layers) autocomplete -* [Description](#description) -* [Install](#install) -* [Configuration](#configuration) - * [Key bindings](#key-bindings) - * [Snippets directories](#snippets-directories) - * [Show snippets in auto-completion popup](#show-snippets-in-auto-completion-popup) -* [Key bindings](#key-bindings-1) - * [auto-complete](#auto-complete) - * [Neosnippet](#neosnippet) + +- [Description](#description) +- [Install](#install) +- [Configuration](#configuration) + - [Key bindings](#key-bindings) + - [Snippets directories](#snippets-directories) + - [Show snippets in auto-completion popup](#show-snippets-in-auto-completion-popup) +- [LSP supported](#lsp-supported) +- [Key bindings](#key-bindings-1) + - [auto-complete](#auto-complete) + - [Neosnippet](#neosnippet) @@ -95,6 +97,8 @@ call SpaceVim#layers#load('autocomplete', { \ }) ``` +## LSP supported + ## Key bindings ### auto-complete