Gaze/SpaceVim
1
0
Fork 0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-02-09 09:30:04 +08:00
Code Issues Projects Releases Wiki Activity

Fix #1078

Browse Source
This commit is contained in:
wsdjeg 2018-04-22 15:15:34 +08:00
parent 2b5a987950
commit ef42ba235e
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
autoload/SpaceVim/layers/autocomplete.vim
View File

@ -118,6 +118,7 @@ function! SpaceVim#layers#autocomplete#config() abort
if s:tab_key_behavior ==# 'smart' if s:tab_key_behavior ==# 'smart'
if has('patch-7.4.774') if has('patch-7.4.774')
imap <silent><expr><TAB> SpaceVim#mapping#tab() imap <silent><expr><TAB> SpaceVim#mapping#tab()
imap <silent><expr><S-TAB> SpaceVim#mapping#shift_tab()
if g:spacevim_snippet_engine ==# 'neosnippet' if g:spacevim_snippet_engine ==# 'neosnippet'
smap <expr><TAB> smap <expr><TAB>
\ neosnippet#expandable_or_jumpable() ? \ neosnippet#expandable_or_jumpable() ?
@ -125,18 +126,14 @@ function! SpaceVim#layers#autocomplete#config() abort
\ (complete_parameter#jumpable(1) ? \ (complete_parameter#jumpable(1) ?
\ "\<plug>(complete_parameter#goto_next_parameter)" : \ "\<plug>(complete_parameter#goto_next_parameter)" :
\ "\<TAB>") \ "\<TAB>")
imap <silent><expr><S-TAB> SpaceVim#mapping#shift_tab()
elseif g:spacevim_snippet_engine ==# 'ultisnips' elseif g:spacevim_snippet_engine ==# 'ultisnips'
imap <silent><expr><TAB> SpaceVim#mapping#tab()
imap <silent><expr><S-TAB> SpaceVim#mapping#shift_tab()
snoremap <silent> <TAB> snoremap <silent> <TAB>
\ <ESC>:call UltiSnips#JumpForwards()<CR> \ <ESC>:call UltiSnips#JumpForwards()<CR>
snoremap <silent> <S-TAB> snoremap <silent> <S-TAB>
\ <ESC>:call UltiSnips#JumpBackwards()<CR> \ <ESC>:call UltiSnips#JumpBackwards()<CR>
else
endif endif
else else
call SpaceVim#logger#warn('smart tab in autocomplete layer need patch 7.4.774') call SpaceVim#logger#info('smart tab in autocomplete layer need patch 7.4.774')
endif endif
elseif s:tab_key_behavior ==# 'complete' elseif s:tab_key_behavior ==# 'complete'
inoremap <expr> <Tab> pumvisible() ? "\<C-y>" : "\<C-n>" inoremap <expr> <Tab> pumvisible() ? "\<C-y>" : "\<C-n>"
@ -157,9 +154,14 @@ function! SpaceVim#layers#autocomplete#config() abort
inoremap <expr> <PageDown> pumvisible() ? "\<PageDown>\<C-p>\<C-n>" : "\<PageDown>" inoremap <expr> <PageDown> pumvisible() ? "\<PageDown>\<C-p>\<C-n>" : "\<PageDown>"
inoremap <expr> <PageUp> pumvisible() ? "\<PageUp>\<C-p>\<C-n>" : "\<PageUp>" inoremap <expr> <PageUp> pumvisible() ? "\<PageUp>\<C-p>\<C-n>" : "\<PageUp>"
" in origin vim or neovim Alt + / will insert a /, this should be disabled. " in origin vim or neovim Alt + / will insert a /, this should be disabled.
imap <expr> <M-/> let g:complete_parameter_use_ultisnips_mapping = 1
\ neosnippet#expandable() ? if g:spacevim_snippet_engine ==# 'neosnippet'
\ "\<Plug>(neosnippet_expand)" : "" imap <expr> <M-/>
\ neosnippet#expandable() ?
\ "\<Plug>(neosnippet_expand)" : ""
elseif g:spacevim_snippet_engine ==# 'ultisnips'
inoremap <silent> <M-/> <C-R>=UltiSnips#ExpandSnippetOrJump()<cr>
endif
let g:_spacevim_mappings_space.i = {'name' : '+Insertion'} let g:_spacevim_mappings_space.i = {'name' : '+Insertion'}
if g:spacevim_snippet_engine ==# 'neosnippet' if g:spacevim_snippet_engine ==# 'neosnippet'

8
config/plugins_before/ultisnips.vim
View File

@ -1,6 +1,6 @@
" If you want :UltiSnipsEdit to split your window. " If you want :UltiSnipsEdit to split your window.
let g:UltiSnipsEditSplit="vertical" let g:UltiSnipsEditSplit = 'vertical'
let g:UltiSnipsExpandTrigger='<Nop>' let g:UltiSnipsExpandTrigger = get(g:, 'UltiSnipsExpandTrigger', '<C-j>')
let g:UltiSnipsJumpBackwardTrigger='<Nop>' let g:UltiSnipsJumpBackwardTrigger = get(g:, 'UltiSnipsJumpBackwardTrigger', '<C-j>')
let g:UltiSnipsJumpForwardTrigger='<Nop>' let g:UltiSnipsJumpForwardTrigger = get(g:, 'UltiSnipsJumpForwardTrigger', '<C-j>')
let g:UltiSnipsSnippetsDir = '~/.SpaceVim.d/UltiSnips' let g:UltiSnipsSnippetsDir = '~/.SpaceVim.d/UltiSnips'