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

Fix #359 completed snippets problem

Browse Source
This commit is contained in:
Shougo Matsushita
2016-11-22 03:51:38 +09:00
parent 22bf961126
commit 4cdeabfa89
3 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
autoload/neosnippet/mappings.vim
View File

@@ -47,7 +47,8 @@ function! neosnippet#mappings#completed_expandable() abort "{{{
endif
let snippet = neosnippet#parser#_get_completed_snippet(
\ v:completed_item, neosnippet#util#get_next_text())
\ v:completed_item, neosnippet#util#get_cur_text(),
\ neosnippet#util#get_next_text())
return snippet != ''
endfunction"}}}
function! s:enabled_completed_snippet() abort "{{{
@@ -170,7 +171,7 @@ endfunction"}}}
function! s:snippets_expand(cur_text, col) abort "{{{
if s:enabled_completed_snippet()
let snippet = neosnippet#parser#_get_completed_snippet(
\ v:completed_item, neosnippet#util#get_next_text())
\ 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

8
autoload/neosnippet/parser.vim
View File

@@ -298,10 +298,14 @@ function! neosnippet#parser#_initialize_snippet_options() abort "{{{
\ }
endfunction"}}}
function! neosnippet#parser#_get_completed_snippet(completed_item, next_text) abort "{{{
function! neosnippet#parser#_get_completed_snippet(completed_item, cur_text, next_text) abort "{{{
let item = a:completed_item
if has_key(item, "snippet")
if strridx(a:cur_text, item.word) != len(a:cur_text) - len(item.word)
return ''
endif
if has_key(item, 'snippet')
return item.snippet
endif