From 584e5d9a7e3abd288b1000a61691f44ea3c67ea6 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Sun, 2 Apr 2017 23:13:10 +0800
Subject: [PATCH] Fix enter mapping

---
 autoload/SpaceVim/default.vim       |  2 +-
 autoload/SpaceVim/mapping/enter.vim | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 autoload/SpaceVim/mapping/enter.vim

diff --git a/autoload/SpaceVim/default.vim b/autoload/SpaceVim/default.vim
index a6cebede7..d07808b4e 100644
--- a/autoload/SpaceVim/default.vim
+++ b/autoload/SpaceVim/default.vim
@@ -162,7 +162,7 @@ function! SpaceVim#default#SetMappings() abort
   imap <expr><S-TAB> pumvisible() ? "\<C-p>" : ""
   imap <silent><expr><S-TAB> SpaceVim#mapping#shift_tab()
   smap <expr><TAB> neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
-  inoremap <silent><expr><CR> SpaceVim#mapping#enter()
+  imap <silent><expr><CR> SpaceVim#mapping#enter#i_enter()
   inoremap <expr> <Down>     pumvisible() ? "\<C-n>" : "\<Down>"
   inoremap <expr> <Up>       pumvisible() ? "\<C-p>" : "\<Up>"
   inoremap <expr> <PageDown> pumvisible() ? "\<PageDown>\<C-p>\<C-n>" : "\<PageDown>"
diff --git a/autoload/SpaceVim/mapping/enter.vim b/autoload/SpaceVim/mapping/enter.vim
new file mode 100644
index 000000000..0eb58227b
--- /dev/null
+++ b/autoload/SpaceVim/mapping/enter.vim
@@ -0,0 +1,14 @@
+
+if g:spacevim_snippet_engine ==# 'neosnippet'
+  function! SpaceVim#mapping#enter#i_enter() abort
+    if pumvisible()
+      if neosnippet#expandable_or_jumpable()
+        return "\<plug>(neosnippet_expand_or_jump)"
+      endif
+    else
+      return "\<Enter>"
+    endif
+  endfunction
+elseif g:spacevim_snippet_engine ==# 'ultisnips'
+endif
+" vim:set et sw=2 cc=80: