From 04626b9e4d2a0b3e4fa46ae33965245e519ee6be Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Thu, 2 Feb 2017 23:13:15 +0800 Subject: [PATCH 1/4] Add snippet --- filetype.vim | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 filetype.vim diff --git a/filetype.vim b/filetype.vim new file mode 100644 index 000000000..e69de29bb From 1b801d51f9b24958f112832f10d84f5045d155b4 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Thu, 2 Feb 2017 23:46:14 +0800 Subject: [PATCH 2/4] Add snippet doc --- autoload/SpaceVim/layers/autocomplete.vim | 5 ++++- doc/SpaceVim.txt | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/autoload/SpaceVim/layers/autocomplete.vim b/autoload/SpaceVim/layers/autocomplete.vim index b7a470973..c0791456b 100644 --- a/autoload/SpaceVim/layers/autocomplete.vim +++ b/autoload/SpaceVim/layers/autocomplete.vim @@ -13,7 +13,10 @@ " @subsection snippet " SpaceVim use neosnippet as default snippet engine, and the default snippets " is `Shougo/neosnippet-snippets`. for more information, please read -" |neosnippet|. +" |neosnippet|. neosnippet support custtom snippets, and the default snippets +" directory is `~/.SpaceVim.d/snippets/` and if +" g:spacevim_force_global_config = 1, SpaceVim will not append +" `./.SpaceVim.d/snippets` as default snippets directory. diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt index 29a722a8d..957f948cb 100644 --- a/doc/SpaceVim.txt +++ b/doc/SpaceVim.txt @@ -260,6 +260,9 @@ see |g:spacevim_enable_ycm|. SNIPPET SpaceVim use neosnippet as default snippet engine, and the default snippets is `Shougo/neosnippet-snippets`. for more information, please read |neosnippet|. +neosnippet support custtom snippets, and the default snippets directory is +`~/.SpaceVim.d/snippets/` and if g:spacevim_force_global_config = 1, SpaceVim +will not append `./.SpaceVim.d/snippets` as default snippets directory. ============================================================================== COLORSCHEME *SpaceVim-colorscheme* From 896ed2ff6db8d6f1244076a108d4cc6a8709269b Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Thu, 2 Feb 2017 23:51:26 +0800 Subject: [PATCH 3/4] Add snippet dir --- config/plugins/neosnippet.vim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/plugins/neosnippet.vim b/config/plugins/neosnippet.vim index fa360ccfe..98d575722 100644 --- a/config/plugins/neosnippet.vim +++ b/config/plugins/neosnippet.vim @@ -1,5 +1,6 @@ -if isdirectory(expand('~/DotFiles/snippets/')) - let g:neosnippet#snippets_directory = expand('~/DotFiles/snippets/') +let g:neosnippet#snippets_directory = [expand('~/.SpaceVim.d/snippets/')] +if g:spacevim_force_global_config == 0 + call add(g:neosnippet#snippets_directory, getcwd() . '/.Spacevim.d/snippets') endif let g:neosnippet#enable_snipmate_compatibility=1 let g:neosnippet#enable_complete_done = 1 From 605ed2f38aa539caf72732869d41d23c98fd7920 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Fri, 3 Feb 2017 01:50:42 +0800 Subject: [PATCH 4/4] Add support for spacevim's snippets --- config/plugins/neosnippet.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/plugins/neosnippet.vim b/config/plugins/neosnippet.vim index 98d575722..07cc6fd6c 100644 --- a/config/plugins/neosnippet.vim +++ b/config/plugins/neosnippet.vim @@ -1,4 +1,4 @@ -let g:neosnippet#snippets_directory = [expand('~/.SpaceVim.d/snippets/')] +let g:neosnippet#snippets_directory = [expand('~/.SpaceVim.d/snippets/'), expand('~/.SpaceVim/snippets/')] if g:spacevim_force_global_config == 0 call add(g:neosnippet#snippets_directory, getcwd() . '/.Spacevim.d/snippets') endif