hasufell/neosnippet.vim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #398 v:completed_item.snippet and v:completed_item.snippet_trigger support

Browse Source
This commit is contained in:
Shougo Matsushita 2017-09-02 17:30:42 +09:00
parent b0d6b1c7e0
commit 0e829d51b1
1 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
autoload/neosnippet/mappings.vim
View File

@ -147,13 +147,8 @@ function! neosnippet#mappings#_expand(trigger) abort "{{{
endfunction"}}}
function! s:snippets_expand(cur_text, col) abort "{{{
if s:enabled_completed_snippet()
let snippet = neosnippet#parser#_get_completed_snippet(
\ v:completed_item, a:cur_text, neosnippet#util#get_next_text())
if snippet != ''
call neosnippet#view#_insert(snippet, {}, a:cur_text, a:col)
return 0
endif
if s:expand_completed_snippets(a:cur_text, a:col)
return 0
endif
let cur_word = neosnippet#helpers#get_cursor_snippet(
@ -168,6 +163,38 @@ function! s:snippets_expand(cur_text, col) abort "{{{
return 1
endfunction"}}}
function! s:expand_completed_snippets(cur_text, col) abort "{{{
if !s:enabled_completed_snippet()
return 0
endif
let cur_text = a:cur_text
if !empty(get(g:, 'deoplete#_context', []))
\ && has_key(v:completed_item, 'word')
let completed_candidates = filter(copy(g:deoplete#_context),
\ "has_key(v:val, 'snippet') && has_key(v:val, 'snippet_trigger')
\ && v:val.word ==# v:completed_item.word")
if !empty(completed_candidates)
let v:completed_item.snippet = completed_candidates[0].snippet
let v:completed_item.snippet_trigger =
\ completed_candidates[0].snippet_trigger
endif
endif
let snippet = neosnippet#parser#_get_completed_snippet(
\ v:completed_item, cur_text, neosnippet#util#get_next_text())
if snippet == ''
return 0
endif
if has_key(v:completed_item, 'snippet_trigger')
let cur_text = cur_text[: -1-len(v:completed_item.snippet_trigger)]
endif
call neosnippet#view#_insert(snippet, {}, cur_text, a:col)
return 1
endfunction"}}}
function! s:snippets_expand_or_jump(cur_text, col) abort "{{{
if s:snippets_expand(a:cur_text, a:col)