From e6df9f8f07d0a9f99ce355c52ee8ccd33fc3fd81 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Tue, 1 Aug 2017 06:51:11 +0800
Subject: [PATCH] Fix #762

---
 autoload/SpaceVim/layers/autocomplete.vim | 23 +++++++------
 autoload/SpaceVim/mapping.vim             | 39 ++---------------------
 autoload/SpaceVim/mapping/tab.vim         | 27 +++++++---------
 3 files changed, 24 insertions(+), 65 deletions(-)

diff --git a/autoload/SpaceVim/layers/autocomplete.vim b/autoload/SpaceVim/layers/autocomplete.vim
index 2f63429cb..64eeec865 100644
--- a/autoload/SpaceVim/layers/autocomplete.vim
+++ b/autoload/SpaceVim/layers/autocomplete.vim
@@ -65,21 +65,20 @@ endfunction
 
 
 function! SpaceVim#layers#autocomplete#config() abort
-  if g:spacevim_autocomplete_method ==# 'ycm'
-    sunmap <S-TAB>
-    iunmap <S-TAB>
-  endif
   let g:delimitMate_matchpairs = '[:],{:},<:>'
   inoremap <silent><expr> ( complete_parameter#pre_complete("()")
-  "mapping
-  imap <silent><expr><TAB> SpaceVim#mapping#tab#i_tab()
-  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)" : (complete_parameter#jumpable(1) ? "\<plug>(complete_parameter#goto_next_parameter)" : "\<TAB>")
-  imap <silent><expr><CR> SpaceVim#mapping#enter#i_enter()
-  smap <expr><S-TAB> pumvisible() ? "\<C-p>" : ""
 
-  
+  "mapping
+  imap <silent><expr><TAB> SpaceVim#mapping#tab()
+  imap <silent><expr><S-TAB> SpaceVim#mapping#shift_tab()
+  imap <silent><expr><CR> SpaceVim#mapping#enter()
+  smap <expr><TAB>
+        \ neosnippet#expandable_or_jumpable() ?
+        \ "\<Plug>(neosnippet_expand_or_jump)" :
+        \ (complete_parameter#jumpable(1) ?
+        \ "\<plug>(complete_parameter#goto_next_parameter)" :
+        \ "\<TAB>")
+
   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.vim b/autoload/SpaceVim/mapping.vim
index b7a593036..a5a2d7b84 100644
--- a/autoload/SpaceVim/mapping.vim
+++ b/autoload/SpaceVim/mapping.vim
@@ -80,46 +80,11 @@ function! SpaceVim#mapping#shift_tab() abort
 endfunction
 
 function! SpaceVim#mapping#tab() abort
-  if getline('.')[col('.')-2] ==# '{'&& pumvisible()
-    return "\<C-n>"
-  endif
-  if index(g:spacevim_plugin_groups, 'autocomplete') != -1
-    if neosnippet#expandable() && getline('.')[col('.')-2] ==# '(' && !pumvisible()
-      return "\<Plug>(neosnippet_expand)"
-    elseif neosnippet#jumpable()
-          \ && getline('.')[col('.')-2] ==# '(' && !pumvisible() 
-          \ && !neosnippet#expandable()
-      return "\<plug>(neosnippet_jump)"
-    elseif neosnippet#expandable_or_jumpable() && getline('.')[col('.')-2] !=#'('
-      return "\<plug>(neosnippet_expand_or_jump)"
-    elseif pumvisible()
-      return "\<C-n>"
-    elseif complete_parameter#jumpable(1)
-      return "\<plug>(complete_parameter#goto_next_parameter)"
-    else
-      return "\<tab>"
-    endif
-  elseif pumvisible()
-    return "\<C-n>"
-  else
-    return "\<tab>"
-  endif
+  return SpaceVim#mapping#tab#i_tab()
 endfunction
 
 function! SpaceVim#mapping#enter() abort
-  if pumvisible()
-    if getline('.')[col('.') - 2]==# '{'
-      return "\<Enter>"
-    elseif g:spacevim_autocomplete_method ==# 'neocomplete'||g:spacevim_autocomplete_method ==# 'deoplete'
-      return "\<C-y>"
-    else
-      return "\<esc>a"
-    endif
-  elseif getline('.')[col('.') - 2]==#'{'&&getline('.')[col('.')-1]==#'}'
-    return "\<Enter>\<esc>ko"
-  else
-    return "\<Enter>"
-  endif
+  return SpaceVim#mapping#enter#i_enter()
 endfunction
 
 function! SpaceVim#mapping#gd() abort
diff --git a/autoload/SpaceVim/mapping/tab.vim b/autoload/SpaceVim/mapping/tab.vim
index 18e3fdabe..cd3112099 100644
--- a/autoload/SpaceVim/mapping/tab.vim
+++ b/autoload/SpaceVim/mapping/tab.vim
@@ -3,24 +3,18 @@ if g:spacevim_snippet_engine ==# 'neosnippet'
     if getline('.')[col('.')-2] ==# '{'&& pumvisible()
       return "\<C-n>"
     endif
-    if index(g:spacevim_plugin_groups, 'autocomplete') != -1
-      if neosnippet#expandable() && getline('.')[col('.')-2] ==# '(' && !pumvisible()
-        return "\<Plug>(neosnippet_expand)"
-      elseif neosnippet#jumpable()
-            \ && getline('.')[col('.')-2] ==# '(' && !pumvisible() 
-            \ && !neosnippet#expandable()
-        return "\<plug>(neosnippet_jump)"
-      elseif neosnippet#expandable_or_jumpable() && getline('.')[col('.')-2] !=#'('
-        return "\<plug>(neosnippet_expand_or_jump)"
-      elseif pumvisible()
-        return "\<C-n>"
-      elseif complete_parameter#jumpable(1)
-        return "\<plug>(complete_parameter#goto_next_parameter)"
-      else
-        return "\<tab>"
-      endif
+    if neosnippet#expandable() && getline('.')[col('.')-2] ==# '(' && !pumvisible()
+      return "\<Plug>(neosnippet_expand)"
+    elseif neosnippet#jumpable()
+          \ && getline('.')[col('.')-2] ==# '(' && !pumvisible() 
+          \ && !neosnippet#expandable()
+      return "\<plug>(neosnippet_jump)"
+    elseif neosnippet#expandable_or_jumpable() && getline('.')[col('.')-2] !=#'('
+      return "\<plug>(neosnippet_expand_or_jump)"
     elseif pumvisible()
       return "\<C-n>"
+    elseif complete_parameter#jumpable(1) && getline('.')[col('.')-2] !=# ')'
+      return "\<plug>(complete_parameter#goto_next_parameter)"
     else
       return "\<tab>"
     endif
@@ -30,4 +24,5 @@ elseif g:spacevim_snippet_engine ==# 'ultisnips'
     return "\<tab>"
   endfunction
 endif
+
 " vim:set et sw=2 cc=80: