Permalink
Browse files

Fix #368 select commas

  • Loading branch information...
1 parent 61ffe8b commit 13c51ee885216619ab2dcd1a2c3790b83f85f27c @Shougo committed Jan 9, 2017
Showing with 5 additions and 11 deletions.
  1. +2 −8 autoload/neosnippet/parser.vim
  2. +3 −3 test/functions.vim
@@ -359,11 +359,8 @@ function! neosnippet#parser#_get_completed_snippet(completed_item, cur_text, nex
for arg in split(substitute(
\ neosnippet#parser#_get_in_paren('<', '>', abbr),
\ '<\zs.\{-}\ze>', '', 'g'), '[^[]\zs\s*,\s*')
- if args != '' && arg !=# '...'
- let args .= ', '
- endif
let args .= printf('${%d:#:%s%s}',
- \ cnt, ((args != '' && arg ==# '...') ? ', ' : ''),
+ \ cnt, ((args != '') ? ', ' : ''),
\ escape(arg, '{}'))
let cnt += 1
endfor
@@ -385,11 +382,8 @@ function! neosnippet#parser#_get_completed_snippet(completed_item, cur_text, nex
continue
endif
- if args != '' && arg !=# '...'
- let args .= ', '
- endif
let args .= printf('${%d:#:%s%s}',
- \ cnt, ((args != '' && arg ==# '...') ? ', ' : ''),
+ \ cnt, ((args != '') ? ', ' : ''),
\ escape(arg, '{}'))
let cnt += 1
endfor
View
@@ -65,12 +65,12 @@ function! s:suite.get_completed_snippet() abort
call s:assert.equals(neosnippet#parser#_get_completed_snippet({
\ 'word' : 'foo(', 'abbr' : 'foo(hoge, piyo)',
\ 'menu' : '', 'info' : ''
- \ }, 'foo(', ''), '${1:#:hoge}, ${2:#:piyo})${3}')
+ \ }, 'foo(', ''), '${1:#:hoge}${2:#:, piyo})${3}')
call s:assert.equals(neosnippet#parser#_get_completed_snippet({
\ 'word' : 'foo(', 'abbr' : 'foo(hoge, piyo(foobar))',
\ 'menu' : '', 'info' : ''
- \ }, 'foo(', ''), '${1:#:hoge}, ${2:#:piyo()})${3}')
+ \ }, 'foo(', ''), '${1:#:hoge}${2:#:, piyo()})${3}')
call s:assert.equals(neosnippet#parser#_get_completed_snippet({
\ 'word' : 'foo(', 'abbr' : 'foo(hoge[, abc])',
@@ -100,7 +100,7 @@ function! s:suite.get_completed_snippet() abort
call s:assert.equals(neosnippet#parser#_get_completed_snippet({
\ 'word' : 'Dictionary', 'abbr' : 'Dictionary<Key, Value>(foo)',
\ 'menu' : '', 'info' : ''
- \ }, 'Dictionary', ''), '<${1:#:Key}, ${2:#:Value}>(${3:#:foo})${4}')
+ \ }, 'Dictionary', ''), '<${1:#:Key}${2:#:, Value}>(${3:#:foo})${4}')
call s:assert.equals(neosnippet#parser#_get_completed_snippet({
\ 'word' : 'Dictionary(',

0 comments on commit 13c51ee

Please sign in to comment.