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

Add angle support

Browse Source
This commit is contained in:
Shougo Matsushita 2015-12-26 12:39:45 +09:00
parent 0b3b441bef
commit ae512e4818
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
autoload/neosnippet/parser.vim
View File

@ -315,6 +315,26 @@ function! neosnippet#parser#_get_completed_snippet(completed_item) "{{{
" Make snippet arguments
let cnt = 1
let snippet = ''
if abbr =~ '<.\+>'
" Add angle analysis
let snippet .= '<'
let args = ''
for arg in split(substitute(
\ neosnippet#parser#_get_in_paren('<', '>', abbr),
\ '<\zs.\{-}\ze>', '', 'g'), '[^[]\zs\s*,\s*')
if args != ''
let args .= ', '
endif
let args .= printf('${%d:#:%s}', cnt, escape(arg, '{}'))
let cnt += 1
endfor
let snippet .= args
let snippet .= '>'
endif
let args = ''
for arg in split(substitute(
\ neosnippet#parser#_get_in_paren(key, pair, abbr),
\ key.'\zs.\{-}\ze'.pair, '', 'g'), '[^[]\zs\s*,\s*')
@ -323,12 +343,13 @@ function! neosnippet#parser#_get_completed_snippet(completed_item) "{{{
continue
endif
if cnt != 1
let snippet .= ', '
if args != ''
let args .= ', '
endif
let snippet .= printf('${%d:#:%s}', cnt, escape(arg, '{}'))
let args .= printf('${%d:#:%s}', cnt, escape(arg, '{}'))
let cnt += 1
endfor
let snippet .= args
let snippet .= pair

5
test/functions.vim
View File

@ -67,5 +67,10 @@ function! s:suite.get_completed_snippet()
\ 'word' : 'foo{', 'abbr' : 'foo{piyo}',
\ 'menu' : '', 'info' : ''
\ }), '${1:#:piyo}}${2}')
call s:assert.equals(neosnippet#parser#_get_completed_snippet({
\ 'word' : 'Dictionary(', 'abbr' : 'Dictionary<Key, Value>(foo)',
\ 'menu' : '', 'info' : ''
\ }), '<${1:#:Key}, ${2:#:Value}>${3:#:foo})${4}')
endfunction