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

Fix nested snippets behavior

Browse Source
This commit is contained in:
Shougo Matsushita 2015-12-19 09:09:19 +09:00
parent 05c00bfd18
commit de5a7e284d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autoload/neosnippet/variables.vim
View File

@ -46,6 +46,9 @@ function! neosnippet#variables#expand_stack() "{{{
return s:expand_stack return s:expand_stack
endfunction"}}} endfunction"}}}
function! neosnippet#variables#pop_expand_stack() "{{{
let s:expand_stack = s:expand_stack[: -2]
endfunction"}}}
function! neosnippet#variables#clear_expand_stack() "{{{ function! neosnippet#variables#clear_expand_stack() "{{{
let s:expand_stack = [] let s:expand_stack = []
endfunction"}}} endfunction"}}}

9
autoload/neosnippet/view.vim
View File

@ -167,10 +167,9 @@ function! neosnippet#view#_jump(_, col) "{{{
endif endif
" Not found. " Not found.
let expand_stack = neosnippet#variables#expand_stack() call neosnippet#variables#pop_expand_stack()
let expand_stack = expand_stack[: -2]
return neosnippet#view#_search_outof_range(a:col) return neosnippet#view#_jump(a:_, a:col)
endfunction"}}} endfunction"}}}
function! s:indent_snippet(begin, end) "{{{ function! s:indent_snippet(begin, end) "{{{
@ -229,6 +228,10 @@ function! neosnippet#view#_get_snippet_range(begin_line, begin_patterns, end_lin
let begin = 1 let begin = 1
endif endif
if a:begin_line == a:end_line
return [begin, begin]
endif
call cursor(a:end_line, 0) call cursor(a:end_line, 0)
if empty(a:end_patterns) if empty(a:end_patterns)
let end = line('.') + 50 let end = line('.') + 50