Fix skip completion behavior

This commit is contained in:
Shougo Matsushita 2016-01-09 23:03:19 +09:00
parent d1fa664ec9
commit f106827933

View File

@ -27,8 +27,6 @@ let s:save_cpo = &cpo
set cpo&vim set cpo&vim
function! neosnippet#view#_expand(cur_text, col, trigger_name) "{{{ function! neosnippet#view#_expand(cur_text, col, trigger_name) "{{{
call s:skip_next_auto_completion()
let snippets = neosnippet#helpers#get_snippets() let snippets = neosnippet#helpers#get_snippets()
if a:trigger_name == '' || !has_key(snippets, a:trigger_name) if a:trigger_name == '' || !has_key(snippets, a:trigger_name)
@ -135,8 +133,7 @@ function! neosnippet#view#_insert(snippet, options, cur_text, col) "{{{
endtry endtry
endfunction"}}} endfunction"}}}
function! neosnippet#view#_jump(_, col) "{{{ function! neosnippet#view#_jump(_, col) "{{{
call s:skip_next_auto_completion() try
let expand_stack = neosnippet#variables#expand_stack() let expand_stack = neosnippet#variables#expand_stack()
" Get patterns and count. " Get patterns and count.
@ -174,6 +171,9 @@ function! neosnippet#view#_jump(_, col) "{{{
call neosnippet#variables#pop_expand_stack() call neosnippet#variables#pop_expand_stack()
return neosnippet#view#_jump(a:_, a:col) return neosnippet#view#_jump(a:_, a:col)
finally
call s:skip_next_auto_completion()
endtry
endfunction"}}} endfunction"}}}
function! s:indent_snippet(begin, end) "{{{ function! s:indent_snippet(begin, end) "{{{